svn commit: r17699 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui
Linus Tolke <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: linus
Date: 2009-12-22 01:22:51-0800
New Revision: 17699
Modified:
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationConnectionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndQualifiersListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassOperationListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierFeatureListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierParameterListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEnumerationLiteralsListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEventParameterListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkConnectionListModel.java
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java
Log:
Fixed the problems with Java5.
Also remove not used imports in the same files.
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java 2009-12-22 01:22:51-0800
@@ -455,10 +455,9 @@
}
- @Override
public void contentsChanged(ListDataEvent e) {
}
- @Override
+
public void intervalAdded(ListDataEvent e) {
if (e.getIndex0() == e.getIndex1()
&& getModel().getElementAt(e.getIndex0()) == movedModelElement.getElement()) {
@@ -476,8 +475,7 @@
SwingUtilities.invokeLater(doWorkRunnable);
}
}
-
- @Override
+
public void intervalRemoved(ListDataEvent e) {
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionArgumentListModel.java 2009-12-22 01:22:51-0800
@@ -25,10 +25,8 @@
package org.argouml.core.propertypanels.ui;
import java.util.Collection;
-import java.util.List;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementOrderedListModel2;
/**
* Model for action's actual argument list.
@@ -66,7 +64,6 @@
return Model.getFacade().isAArgument(element);
}
- @Override
public Collection getModelElements() {
return Model.getFacade().getActualArguments(getTarget());
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionListModel.java 2009-12-22 01:22:51-0800
@@ -25,7 +25,6 @@
package org.argouml.core.propertypanels.ui;
import java.util.Collection;
-import java.util.List;
import org.argouml.model.Model;
@@ -61,7 +60,6 @@
return Model.getFacade().isAAction(element);
}
- @Override
public Collection getModelElements() {
return Model.getFacade().getActions(getTarget());
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationConnectionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationConnectionListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationConnectionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationConnectionListModel.java 2009-12-22 01:22:51-0800
@@ -27,10 +27,8 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementOrderedListModel2;
/**
* The list model for the connections of the association. <p>
@@ -106,7 +104,6 @@
&& Model.getFacade().getConnections(getTarget()).contains(o);
}
- @Override
public Collection getModelElements() {
return Model.getFacade().getConnections(getTarget());
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndQualifiersListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndQualifiersListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndQualifiersListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndQualifiersListModel.java 2009-12-22 01:22:51-0800
@@ -26,10 +26,8 @@
package org.argouml.core.propertypanels.ui;
import java.util.Collection;
-import java.util.List;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementOrderedListModel2;
/**
* @author [email protected]
@@ -63,7 +61,6 @@
&& Model.getFacade().getQualifiers(getTarget()).contains(o);
}
- @Override
public Collection getModelElements() {
// TODO Auto-generated method stub
return Model.getFacade().getQualifiers(getTarget());
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassOperationListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassOperationListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassOperationListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassOperationListModel.java 2009-12-22 01:22:51-0800
@@ -25,7 +25,6 @@
package org.argouml.core.propertypanels.ui;
import java.util.Collection;
-import java.util.List;
import org.argouml.model.Model;
@@ -64,7 +63,6 @@
.contains(element));
}
- @Override
public Collection getModelElements() {
return
Model.getFacade().getOperationsAndReceptions(getTarget());
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierFeatureListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierFeatureListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierFeatureListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierFeatureListModel.java 2009-12-22 01:22:51-0800
@@ -25,10 +25,8 @@
package org.argouml.core.propertypanels.ui;
import java.util.Collection;
-import java.util.List;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementOrderedListModel2;
/**
*
@@ -61,7 +59,6 @@
return getModelElements().contains(element);
}
- @Override
public Collection getModelElements() {
return Model.getFacade().getFeatures(getTarget());
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierParameterListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierParameterListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierParameterListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierParameterListModel.java 2009-12-22 01:22:51-0800
@@ -25,10 +25,8 @@
package org.argouml.core.propertypanels.ui;
import java.util.Collection;
-import java.util.List;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementOrderedListModel2;
/**
* This is the model for the list of parameters for a classifier,
@@ -68,7 +66,6 @@
return Model.getFacade().getParameters(getTarget()).contains(element);
}
- @Override
public Collection getModelElements() {
return Model.getFacade().getParameters(getTarget());
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEnumerationLiteralsListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEnumerationLiteralsListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEnumerationLiteralsListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEnumerationLiteralsListModel.java 2009-12-22 01:22:51-0800
@@ -25,10 +25,8 @@
package org.argouml.core.propertypanels.ui;
import java.util.Collection;
-import java.util.List;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementOrderedListModel2;
/**
*
@@ -71,7 +69,6 @@
return false;
}
- @Override
public Collection getModelElements() {
return Model.getFacade().getEnumerationLiterals(getTarget());
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEventParameterListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEventParameterListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEventParameterListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEventParameterListModel.java 2009-12-22 01:22:51-0800
@@ -58,7 +58,6 @@
return getModelElements().contains(element);
}
- @Override
public Collection getModelElements() {
return Model.getFacade().getParameters(getTarget());
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java 2009-12-22 01:22:51-0800
@@ -25,7 +25,6 @@
package org.argouml.core.propertypanels.ui;
import java.util.Collection;
-import java.util.List;
import org.argouml.model.Model;
import org.argouml.uml.ui.behavior.use_cases.ActionAddExtendExtensionPoint;
@@ -67,7 +66,6 @@
&& getModelElements().contains(o);
}
- @Override
public Collection getModelElements() {
return Model.getFacade().getExtensionPoints(getTarget());
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkConnectionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkConnectionListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkConnectionListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkConnectionListModel.java 2009-12-22 01:22:51-0800
@@ -60,7 +60,6 @@
return getModelElements().contains(element);
}
- @Override
public Collection getModelElements() {
return Model.getFacade().getConnections(getTarget());
}
Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java?view=diff&pathrev=17699&r1=17698&r2=17699
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java (original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java 2009-12-22 01:22:51-0800
@@ -24,13 +24,9 @@
package org.argouml.core.propertypanels.ui;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
import org.argouml.model.Model;
-import org.argouml.uml.ui.UMLModelElementOrderedListModel2;
import org.argouml.uml.ui.behavior.use_cases.ActionNewUseCaseExtensionPoint;
/**
@@ -72,7 +68,6 @@
return getModelElements().contains(o);
}
- @Override
public Collection getModelElements() {
return Model.getFacade().getExtensionPoints(getTarget());
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2432259
To unsubscribe from this discussion, e-mail: [[email protected]].