svn commit: r19917 - trunk/src/argouml-app: . META-INF lib src/org/argouml/kernel tools/eclipse
[email protected] Sat, 28 Jun 2014 07:20:59 -0700 (PDT)
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bobtarling
Date: 2014-06-28 07:20:59-0700
New Revision: 19917
Added:
trunk/src/argouml-app/lib/gef-0.13.9M1.jar (contents, props changed)
trunk/src/argouml-app/src/org/argouml/kernel/ProjectEvent.java
trunk/src/argouml-app/src/org/argouml/kernel/ProjectListener.java
Removed:
trunk/src/argouml-app/lib/gef-0.13.8.jar
Modified:
trunk/src/argouml-app/.classpath
trunk/src/argouml-app/META-INF/MANIFEST.MF
trunk/src/argouml-app/build.properties
trunk/src/argouml-app/build.xml
trunk/src/argouml-app/lib/.classpath
trunk/src/argouml-app/lib/build.properties
trunk/src/argouml-app/src/org/argouml/kernel/Project.java
trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java
trunk/src/argouml-app/tools/eclipse/ArgoUML DEBUG.launch
trunk/src/argouml-app/tools/eclipse/ArgoUML Languages.launch
trunk/src/argouml-app/tools/eclipse/ArgoUML with all delivered modules.launch
trunk/src/argouml-app/tools/eclipse/ArgoUML.launch
Log:
The next GEF milestone release
Modified: trunk/src/argouml-app/.classpath
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/.classpath?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/.classpath (original)
+++ trunk/src/argouml-app/.classpath 2014-06-28 07:20:59-0700
@@ -5,7 +5,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/gef-0.13.8.jar" sourcepath="/gef/src"/>
+ <classpathentry exported="true" kind="lib" path="lib/gef-0.13.9M1.jar" sourcepath="/gef/src"/>
<classpathentry exported="true" kind="lib" path="lib/ocl-argo-1.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/swidgets-0.1.4.jar" sourcepath="/swidgets/src"/>
<classpathentry exported="true" kind="lib" path="lib/toolbar-1.4.1-20071227.jar" sourcepath="/toolbar/src"/>
Modified: trunk/src/argouml-app/META-INF/MANIFEST.MF
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/META-INF/MANIFEST.MF?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/META-INF/MANIFEST.MF (original)
+++ trunk/src/argouml-app/META-INF/MANIFEST.MF 2014-06-28 07:20:59-0700
@@ -139,7 +139,7 @@
Eclipse-RegisterBuddy: org.argouml.core.infra
Eclipse-BuddyPolicy: registered
Bundle-ClassPath: lib/commons-logging-1.0.2.jar,
- lib/gef-0.13.8.jar,
+ lib/gef-0.13.9M1.jar,
lib/ocl-argo-1.1.jar,
lib/swidgets-0.1.4.jar,
lib/toolbar-1.4.1-20071227.jar,
Modified: trunk/src/argouml-app/build.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/build.properties?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/build.properties (original)
+++ trunk/src/argouml-app/build.properties 2014-06-28 07:20:59-0700
@@ -4,7 +4,7 @@
bin.includes = META-INF/,\
.,\
lib/commons-logging-1.0.2.jar,\
- lib/gef-0.13.8.jar,\
+ lib/gef-0.13.9M1.jar,\
lib/ocl-argo-1.1.jar,\
lib/swidgets-0.1.4.jar,\
lib/toolbar-1.4.1-20071227.jar,\
Modified: trunk/src/argouml-app/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/build.xml?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/build.xml (original)
+++ trunk/src/argouml-app/build.xml 2014-06-28 07:20:59-0700
@@ -678,7 +678,7 @@
-->
<include name="lib/commons-logging-1.0.2.jar"/>
<include name="lib/commons-logging.LICENSE.txt"/>
- <include name="lib/gef-0.13.8.jar"/>
+ <include name="lib/gef-0.13.9M1.jar"/>
<include name="lib/gef.LICENSE.txt"/>
<include name="lib/ocl-argo-1.1.jar"/>
<include name="lib/ocl-argo.LICENSE.txt"/>
Modified: trunk/src/argouml-app/lib/.classpath
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/lib/.classpath?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/lib/.classpath (original)
+++ trunk/src/argouml-app/lib/.classpath 2014-06-28 07:20:59-0700
@@ -8,6 +8,6 @@
<classpathentry exported="true" kind="lib" path="swidgets-0.1.4.jar"/>
<classpathentry exported="true" kind="lib" path="toolbar-1.4.1-20071227.jar" sourcepath="/toolbar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry exported="true" kind="lib" path="gef-0.13.8.jar" sourcepath="/gef"/>
+ <classpathentry exported="true" kind="lib" path="gef-0.13.9M1.jar" sourcepath="/gef"/>
<classpathentry kind="output" path="build-eclipse"/>
</classpath>
Modified: trunk/src/argouml-app/lib/build.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/lib/build.properties?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/lib/build.properties (original)
+++ trunk/src/argouml-app/lib/build.properties 2014-06-28 07:20:59-0700
@@ -5,4 +5,4 @@
ocl-argo-1.1.jar,\
swidgets-0.1.4.jar,\
toolbar-1.4.jar,\
- gef-0.13.8.jar
+ gef-0.13.9M1.jar
Removed: trunk/src/argouml-app/lib/gef-0.13.8.jar
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/lib/gef-0.13.8.jar?view=markup&pathrev=19916
Added: trunk/src/argouml-app/lib/gef-0.13.9M1.jar
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/lib/gef-0.13.9M1.jar?view=markup&pathrev=19917
==============================================================================
Binary file. No diff available.
Modified: trunk/src/argouml-app/src/org/argouml/kernel/Project.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/Project.java?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/Project.java (original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/Project.java 2014-06-28 07:20:59-0700
@@ -1,6 +1,6 @@
/* $Id$
*******************************************************************************
- * Copyright (c) 2010-2012 Contributors - see below
+ * Copyright (c) 2010-2014 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
@@ -667,5 +667,18 @@
* @param isDirty true if the project should be marked as dirty
*/
public void setDirty(boolean isDirty);
+
+ /**
+ * Add a project listener for any class interested in addition and removal of diagrams
+ * from a project
+ * @param listener
+ */
+ public void addProjectListener(ProjectListener listener);
+ /**
+ * Remove a project listener
+ * from a project
+ * @param listener
+ */
+ public void removeProjectListener(ProjectListener listener);
}
Added: trunk/src/argouml-app/src/org/argouml/kernel/ProjectEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/ProjectEvent.java?view=markup&pathrev=19917
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ProjectEvent.java 2014-06-28 07:20:59-0700
@@ -0,0 +1,24 @@
+/* $Id$
+ *******************************************************************************
+ * Copyright (c) 2014 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:
+ * bobta
+ *******************************************************************************
+ */
+
+package org.argouml.kernel;
+
+import java.util.EventObject;
+
+public class ProjectEvent extends EventObject {
+
+ public ProjectEvent(Object arg0) {
+ super(arg0);
+ }
+
+}
Modified: trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java (original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java 2014-06-28 07:20:59-0700
@@ -89,6 +89,8 @@
private static final Logger LOG =
Logger.getLogger(ProjectImpl.class.getName());
+ Set<ProjectListener> projectListeners = new HashSet<ProjectListener>();
+
/**
* Default name for a project.
*/
@@ -757,6 +759,11 @@
d.addPropertyChangeListener("name", new NamePCL());
setSaveEnabled(true);
+ ProjectEvent event = new ProjectEvent(d);
+ for (ProjectListener listener : projectListeners) {
+ listener.diagramAdded(event);
+ }
+
}
/**
@@ -784,6 +791,7 @@
*/
protected void removeDiagram(ArgoDiagram d) {
diagrams.remove(d);
+
/* Remove the dependent
* modelelements, such as the statemachine
* for a statechartdiagram:
@@ -792,6 +800,10 @@
if (o != null) {
moveToTrash(o);
}
+ ProjectEvent event = new ProjectEvent(d);
+ for (ProjectListener listener : projectListeners) {
+ listener.diagramRemoved(event);
+ }
}
public int getPresentationCountFor(Object me) {
@@ -1206,4 +1218,16 @@
getProfileConfiguration().addProfile(profile, m);
}
}
+
+ @Override
+ public void addProjectListener(ProjectListener listener) {
+ System.out.println("ProjectListner added to " + this);
+ projectListeners.add(listener);
+ }
+
+ @Override
+ public void removeProjectListener(ProjectListener listener) {
+ System.out.println("ProjectListner removed from " + this);
+ projectListeners.remove(listener);
+ }
}
Added: trunk/src/argouml-app/src/org/argouml/kernel/ProjectListener.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/ProjectListener.java?view=markup&pathrev=19917
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ProjectListener.java 2014-06-28 07:20:59-0700
@@ -0,0 +1,35 @@
+/* $Id$
+ *******************************************************************************
+ * Copyright (c) 2014 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:
+ * Bob Tarling
+ *******************************************************************************
+ */
+
+package org.argouml.kernel;
+
+/**
+ * An interface to be applied to any class interested in addition or removal of a diagram from a project
+ *
+ * @author Bob Tarling
+ */
+public interface ProjectListener {
+
+ /**
+ * Called when a diagram is added to a project
+ * @param event
+ */
+ void diagramAdded(ProjectEvent event);
+
+ /**
+ * Called when a diagram is removed from a project
+ * @param event
+ */
+ void diagramRemoved(ProjectEvent event);
+
+}
Modified: trunk/src/argouml-app/tools/eclipse/ArgoUML DEBUG.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tools/eclipse/ArgoUML%20DEBUG.launch?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/tools/eclipse/ArgoUML DEBUG.launch (original)
+++ trunk/src/argouml-app/tools/eclipse/ArgoUML DEBUG.launch 2014-06-28 07:20:59-0700
@@ -28,7 +28,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-app" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/antlr-2.7.7.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/commons-logging-1.0.2.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/gef-0.13.8.jar" path="3" sourceAttachmentPath="/gef/src" sourceRootPath="" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/gef-0.13.9M1.jar" path="3" sourceAttachmentPath="/gef/src" sourceRootPath="" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/ocl-argo-1.1.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/swidgets-0.1.4.jar" path="3" sourceAttachmentPath="/swidgets/src" sourceRootPath="" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/toolbar-1.4.1-20071227.jar" path="3" sourceAttachmentPath="/toolbar/src" sourceRootPath="" type="2"/> "/>
Modified: trunk/src/argouml-app/tools/eclipse/ArgoUML Languages.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tools/eclipse/ArgoUML%20Languages.launch?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/tools/eclipse/ArgoUML Languages.launch (original)
+++ trunk/src/argouml-app/tools/eclipse/ArgoUML Languages.launch 2014-06-28 07:20:59-0700
@@ -40,7 +40,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-module-php" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-module-ruby" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-module-sql" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/gef-0.13.8.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/gef-0.13.9M1.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-umlpropertypanels" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-transformer" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-diagrams-sequence2" type="1"/> "/>
Modified: trunk/src/argouml-app/tools/eclipse/ArgoUML with all delivered modules.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tools/eclipse/ArgoUML%20with%20all%20delivered%20modules.launch?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/tools/eclipse/ArgoUML with all delivered modules.launch (original)
+++ trunk/src/argouml-app/tools/eclipse/ArgoUML with all delivered modules.launch 2014-06-28 07:20:59-0700
@@ -28,7 +28,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-app" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/antlr-2.7.7.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/commons-logging-1.0.2.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/gef-0.13.8.jar" path="3" sourceAttachmentPath="/gef/src" sourceRootPath="" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/gef-0.13.9M1.jar" path="3" sourceAttachmentPath="/gef/src" sourceRootPath="" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/ocl-argo-1.1.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/swidgets-0.1.4.jar" path="3" sourceAttachmentPath="/swidgets/src" sourceRootPath="" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/toolbar-1.4.1-20071227.jar" path="3" sourceAttachmentPath="/toolbar/src" sourceRootPath="" type="2"/> "/>
Modified: trunk/src/argouml-app/tools/eclipse/ArgoUML.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tools/eclipse/ArgoUML.launch?view=diff&pathrev=19917&r1=19916&r2=19917
==============================================================================
--- trunk/src/argouml-app/tools/eclipse/ArgoUML.launch (original)
+++ trunk/src/argouml-app/tools/eclipse/ArgoUML.launch 2014-06-28 07:20:59-0700
@@ -28,7 +28,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-app" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/antlr-2.7.7.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/commons-logging-1.0.2.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/gef-0.13.8.jar" path="3" sourceAttachmentPath="/gef/src" sourceRootPath="" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/gef-0.13.9M1.jar" path="3" sourceAttachmentPath="/gef/src" sourceRootPath="" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/ocl-argo-1.1.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/swidgets-0.1.4.jar" path="3" sourceAttachmentPath="/swidgets/src" sourceRootPath="" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-app/lib/toolbar-1.4.1-20071227.jar" path="3" sourceAttachmentPath="/toolbar/src" sourceRootPath="" type="2"/> "/>
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=3084145
To unsubscribe from this discussion, e-mail: [[email protected]].