svn commit: r14243 - trunk/src/model-euml/src/org/argouml/model/euml
[email protected] 28 Mar 2008 06:33:31 -0000
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: tfmorris
Date: 2008-03-27 23:33:31-0700
New Revision: 14243
Modified:
trunk/src/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java
trunk/src/model-euml/src/org/argouml/model/euml/CommonBehaviorHelperEUMLImpl.java
trunk/src/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java
Log:
Style cleanup
Modified: trunk/src/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java?view=diff&rev=14243&p1=trunk/src/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java&p2=trunk/src/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java&r1=14242&r2=14243
==============================================================================
--- trunk/src/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java (original)
+++ trunk/src/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java 2008-03-27 23:33:31-0700
@@ -27,7 +27,6 @@
package org.argouml.model.euml;
import org.argouml.model.ChangeableKind;
-import org.argouml.model.NotImplementedException;
/**
* Eclipse UML2 implementation for ChangeableKind.
Modified: trunk/src/model-euml/src/org/argouml/model/euml/CommonBehaviorHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-euml/src/org/argouml/model/euml/CommonBehaviorHelperEUMLImpl.java?view=diff&rev=14243&p1=trunk/src/model-euml/src/org/argouml/model/euml/CommonBehaviorHelperEUMLImpl.java&p2=trunk/src/model-euml/src/org/argouml/model/euml/CommonBehaviorHelperEUMLImpl.java&r1=14242&r2=14243
==============================================================================
--- trunk/src/model-euml/src/org/argouml/model/euml/CommonBehaviorHelperEUMLImpl.java (original)
+++ trunk/src/model-euml/src/org/argouml/model/euml/CommonBehaviorHelperEUMLImpl.java 2008-03-27 23:33:31-0700
@@ -28,7 +28,6 @@
import java.util.Collection;
import java.util.List;
-import java.util.Vector;
import org.argouml.model.CommonBehaviorHelper;
Modified: trunk/src/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java?view=diff&rev=14243&p1=trunk/src/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java&p2=trunk/src/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java&r1=14242&r2=14243
==============================================================================
--- trunk/src/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java (original)
+++ trunk/src/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java 2008-03-27 23:33:31-0700
@@ -1987,7 +1987,7 @@
return ((Classifier) handle).isAbstract();
} else if (handle instanceof BehavioralFeature) {
return ((BehavioralFeature) handle).isAbstract();
- } else if (handle instanceof Element){
+ } else if (handle instanceof Element) {
return false;
}
throw new IllegalArgumentException();
Modified: trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java?view=diff&rev=14243&p1=trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java&p2=trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java&r1=14242&r2=14243
==============================================================================
--- trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java (original)
+++ trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java 2008-03-27 23:33:31-0700
@@ -29,7 +29,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.EventObject;
import java.util.HashMap;
import java.util.HashSet;
@@ -45,7 +44,6 @@
import org.argouml.model.AddAssociationEvent;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.DeleteInstanceEvent;
-import org.argouml.model.Model;
import org.argouml.model.RemoveAssociationEvent;
import org.eclipse.emf.common.command.CommandStackListener;
import org.eclipse.emf.common.notify.Notification;
@@ -54,7 +52,6 @@
import org.eclipse.emf.ecore.ENamedElement;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
/**
* The implementation of the ModelEventPump for eUML.
@@ -485,35 +482,35 @@
Map<String, List<String>> map = new HashMap<String, List<String>>();
- for (Iterator listIt = listenerList.iterator();
- listIt.hasNext();) {
- Listener listener = (Listener)listIt.next();
-
- if (listener.getProperties() != null){
- for (String eventName : listener.getProperties()){
- if (!map.containsKey(eventName)){
+ for (Iterator listIt = listenerList.iterator(); listIt.hasNext();) {
+ Listener listener = (Listener) listIt.next();
+
+ if (listener.getProperties() != null) {
+ for (String eventName : listener.getProperties()) {
+ if (!map.containsKey(eventName)) {
map.put(eventName, new LinkedList<String>());
}
- map.get(eventName).add(listener.getListener().getClass().getName());
+ map.get(eventName).add(
+ listener.getListener().getClass().getName());
}
- }
- else {
- if (!map.containsKey("")){
+ } else {
+ if (!map.containsKey("")) {
map.put("", new LinkedList<String>());
}
- map.get("").add(listener.getListener().getClass().getName());
- }
+ map.get("")
+ .add(listener.getListener().getClass().getName());
+ }
}
for (Map.Entry o : map.entrySet()) {
- modelElementNode.add((String)o.getKey());
- modelElementNode.add((List<String>)o.getValue());
- }
+ modelElementNode.add((String) o.getKey());
+ modelElementNode.add((List<String>) o.getValue());
+ }
}
return info;
}
- private List newDebugNode(String name) {
- List list = new ArrayList();
+ private List<String> newDebugNode(String name) {
+ List<String> list = new ArrayList<String>();
list.add(name);
return list;
}