Author: bobtarling
Date: 2010-07-16 06:28:21-0700
New Revision: 18519
Added:
trunk/src/argouml-core-diagrams-activity2/ArgoUML activity2 tests.launch
- copied unchanged from r18518, /trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/ArgoUML activity2 tests.launch
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramPropPanelFactory.java
- copied unchanged from r18518, /trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramPropPanelFactory.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramGraphModel.java
- copied unchanged from r18518, /trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramGraphModel.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramRenderer.java
- copied unchanged from r18518, /trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramRenderer.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java
- copied unchanged from r18518, /trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java
Removed:
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/ArgoUML activity2 tests.launch
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/META-INF/MANIFEST.MF
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/build.properties
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/build.xml
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/plugin.properties
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/META-INF/MANIFEST.MF
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramModule.java
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramPropPanelFactory.java
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramFactory.java
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramGraphModel.java
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramRenderer.java
trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java
Modified:
trunk/src/argouml-core-diagrams-activity2/META-INF/MANIFEST.MF
trunk/src/argouml-core-diagrams-activity2/build.xml
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramModule.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramFactory.java
Log:
Move all files down (I seem to created a rogue directory in previous commit)
Modified: trunk/src/argouml-core-diagrams-activity2/META-INF/MANIFEST.MF
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/META-INF/MANIFEST.MF?view=diff&pathrev=18519&r1=18518&r2=18519
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/META-INF/MANIFEST.MF (original)
+++ trunk/src/argouml-core-diagrams-activity2/META-INF/MANIFEST.MF 2010-07-16 06:28:21-0700
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.argouml.activity2
-Bundle-Version: 0.28.0.qualifier
+Bundle-Version: 0.29.3.qualifier
Bundle-ClassPath: .
Export-Package: org.argouml.activity2,
org.argouml.activity2.diagram
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %pluginProvider
-Require-Bundle: org.argouml.app,
- org.argouml.core.infra
+Require-Bundle: org.argouml.app;bundle-version="0.29.3",
+ org.argouml.core.infra;bundle-version="0.29.3"
Bundle-Localization: plugin
-Eclipse-RegisterBuddy: org.argouml.core.infra
+Eclipse-RegisterBuddy: org.argouml.core.infra,org.argouml.app
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/ArgoUML activity2 tests.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/ArgoUML%20activity2%20tests.launch?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/META-INF/MANIFEST.MF
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/META-INF/MANIFEST.MF?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/build.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/build.properties?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/build.xml?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/plugin.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/plugin.properties?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/META-INF/MANIFEST.MF
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/META-INF/MANIFEST.MF?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramModule.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramModule.java?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramPropPanelFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramPropPanelFactory.java?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramFactory.java?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramGraphModel.java?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramRenderer.java?view=markup&pathrev=18518
Removed: trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java?view=markup&pathrev=18518
Modified: trunk/src/argouml-core-diagrams-activity2/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/build.xml?view=diff&pathrev=18519&r1=18518&r2=18519
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/build.xml (original)
+++ trunk/src/argouml-core-diagrams-activity2/build.xml 2010-07-16 06:28:21-0700
@@ -150,7 +150,7 @@
excludes="*.txt,*.bat,*.xml,*.sh"
includes="org/argouml/**"
manifest="src/META-INF/MANIFEST.MF"
- jarfile="${build.dir}/argouml-diagrams-activity2.jar" />
+ jarfile="${build.dir}/argouml-diagrams-activity.jar" />
</target>
@@ -201,7 +201,7 @@
<!-- =================================================================== -->
<!-- Run the junit tests. -->
<!-- =================================================================== -->
- <target name="tests" depends="compile,compile-tests"
+ <target name="tests-xml" depends="compile,compile-tests"
description="Run all tests that don't require any GUI components in headleass mode.">
<mkdir dir="build/tests/reports"/>
@@ -226,6 +226,9 @@
</junit>
</target>
+ <target name="tests" depends="tests-xml"
+ description="Run all the tests."
+ />
<!-- =================================================================== -->
<!-- Eclipse PDE targets from here to end of file -->
@@ -235,6 +238,8 @@
build.jars
gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
gather.logs
+ If p2.gathering = true in build.properties:
+ publish.bin.parts target replaces gather.bin.parts
-->
<target name="pde-properties" if="eclipse.running">
@@ -246,7 +251,7 @@
<property name="bundleId" value="org.argouml.activity2" />
<!-- This property is magic and will have its value substituted by PDE -->
- <property name="version.suffix" value="0.28.0.200904210336"/>
+ <property name="version.suffix" value="0.29.3.201001020415"/>
<property name="bundleVersion" value="${version.suffix}" />
<!-- Compiler settings. -->
@@ -271,6 +276,9 @@
</condition>
<property name="build.result.folder" value="${basedir}" />
<property name="plugin.destination" value="${basedir}" />
+ <condition property="p2.publish.parts" value="true">
+ <istrue value="${p2.gathering}"/>
+ </condition>
</target>
<target name="pde-clean" depends="pde-init">
@@ -302,6 +310,25 @@
<eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
</target>
+
+ <target name="publish.bin.parts" depends="init" if="p2.publish.parts">
+
+ <!-- First call old target to gather binaries -->
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${build.result.folder}"/>
+ </antcall>
+
+ <eclipse.versionReplacer path="${build.result.folder}" version="${bundleVersion}" />
+
+ <!-- Now use P2 publishing tools to publish to our build repository -->
+ <eclipse.gatherBundle
+ metadataRepository="${p2.build.repo}"
+ artifactRepository="${p2.build.repo}"
+ buildResultFolder="${build.result.folder}"
+ baseDirectory="${basedir}"
+ />
+ </target>
+
<target name="gather.logs" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
<copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramModule.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramModule.java?view=diff&pathrev=18519&r1=18518&r2=18519
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramModule.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/ActivityDiagramModule.java 2010-07-16 06:28:21-0700
@@ -1,70 +1,72 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * bobtarling
+ * Bob Tarling
*****************************************************************************
- *
- * Some portions of this file was previously release using the BSD License:
*/
-// Copyright (c) 2007 The Regents of the University of California. All
-// Rights Reserved. Permission to use, copy, modify, and distribute this
-// software and its documentation without fee, and without a written
-// agreement is hereby granted, provided that the above copyright notice
-// and this paragraph appear in all copies. This software program and
-// documentation are copyrighted by The Regents of the University of
-// California. The software program and documentation are supplied "AS
-// IS", without any accompanying services from The Regents. The Regents
-// does not warrant that the operation of the program will be
-// uninterrupted or error-free. The end-user understands that the program
-// was developed for research purposes and is advised not to rely
-// exclusively on the program for any reason. IN NO EVENT SHALL THE
-// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
package org.argouml.activity2;
+import org.apache.log4j.Logger;
+import org.argouml.activity2.diagram.ActivityDiagramFactory;
import org.argouml.moduleloader.ModuleInterface;
+import org.argouml.notation.Notation;
+import org.argouml.notation.NotationName;
+import org.argouml.notation.NotationProviderFactory2;
+import org.argouml.notation.providers.uml.SDMessageNotationUml;
+import org.argouml.persistence.PersistenceManager;
+import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.DiagramFactoryInterface2;
+import org.argouml.uml.diagram.DiagramFactory.DiagramType;
+import org.argouml.uml.ui.PropPanelFactoryManager;
-/**
- * The Class Diagram Module description.
- *
- * @see org.argouml.moduleloader.ModuleInterface
- */
public class ActivityDiagramModule implements ModuleInterface {
+ private static final Logger LOG = Logger
+ .getLogger(ActivityDiagramModule.class);
+
+ private ActivityDiagramPropPanelFactory propPanelFactory;
+
public boolean enable() {
+
+ propPanelFactory =
+ new ActivityDiagramPropPanelFactory();
+ PropPanelFactoryManager.addPropPanelFactory(propPanelFactory);
+ // TODO: Remove the casting to DiagramFactoryInterface2
+ // as soon as DiagramFactoryInterface is removed.
+ DiagramFactory.getInstance().registerDiagramFactory(
+ DiagramType.Activity,
+ (DiagramFactoryInterface2) new ActivityDiagramFactory());
return true;
}
public boolean disable() {
+
+ PropPanelFactoryManager.removePropPanelFactory(propPanelFactory);
+
+ // TODO: Remove the casting to DiagramFactoryInterface2
+ // as soon as DiagramFactoryInterface is removed.
+ DiagramFactory.getInstance().registerDiagramFactory(
+ DiagramType.Activity, (DiagramFactoryInterface2) null);
return true;
}
public String getName() {
- return "ArgoUML-Class";
+ return "ArgoUML-Activity";
}
public String getInfo(int type) {
switch (type) {
case DESCRIPTION:
- return "The new activity diagram implementation";
+ return "Activity diagram implementation";
case AUTHOR:
- return "ArgoUML Core Development Team";
+ return "ArgoUML Team";
case VERSION:
return "0.28";
case DOWNLOADSITE:
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramFactory.java?view=diff&pathrev=18519&r1=18518&r2=18519
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramFactory.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ActivityDiagramFactory.java 2010-07-16 06:28:21-0700
@@ -1,66 +1,45 @@
/* $Id$
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2010 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * bobtarling
+ * Bob Tarling
*****************************************************************************
- *
- * Some portions of this file was previously release using the BSD License:
*/
-// Copyright (c) 2007 The Regents of the University of California. All
-// Rights Reserved. Permission to use, copy, modify, and distribute this
-// software and its documentation without fee, and without a written
-// agreement is hereby granted, provided that the above copyright notice
-// and this paragraph appear in all copies. This software program and
-// documentation are copyrighted by The Regents of the University of
-// California. The software program and documentation are supplied "AS
-// IS", without any accompanying services from The Regents. The Regents
-// does not warrant that the operation of the program will be
-// uninterrupted or error-free. The end-user understands that the program
-// was developed for research purposes and is advised not to rely
-// exclusively on the program for any reason. IN NO EVENT SHALL THE
-// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
package org.argouml.activity2.diagram;
+import java.beans.PropertyVetoException;
+
+import org.apache.log4j.Logger;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactoryInterface2;
import org.argouml.uml.diagram.DiagramSettings;
-/**
- * This factory creates a activity2 Activity Diagram.
- * @see org.argouml.uml.diagram.DiagramFactory
- */
-public class ActivityDiagramFactory implements DiagramFactoryInterface2 {
+public class ActivityDiagramFactory
+ implements DiagramFactoryInterface2{
/**
- * Factory method to create a new instance of an ArgoDiagram.
- *
- * @param owner the owning element. This can be the owning namespace for a
- * Class diagram or an owning Statemachine for a State Diagram or
- * any other interpretation that the diagram type wants to apply.
- * @param name the name of the diagram. This may be null if the caller would
- * like the factory to provide a default name.
- * @param settings default rendering settings for the diagram
- * @return the newly instantiated diagram
+ * Logger.
*/
+ private static final Logger LOG =
+ Logger.getLogger(ActivityDiagramFactory.class);
+
public ArgoDiagram createDiagram(Object owner, String name,
DiagramSettings settings) {
- return null;
+ final ArgoDiagram diagram = new UMLActivityDiagram(owner);
+ if (name != null) {
+ try {
+ diagram.setName(name);
+ } catch (PropertyVetoException e) {
+ LOG.error("Cannot set the name " + name +
+ " to the diagram just created: "+ diagram.getName(), e);
+ }
+ }
+ return diagram;
}
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2634042
To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.