svn commit: r13747 - trunk/src_new/org/argouml/ui/explorer/rules
[email protected] 11 Nov 2007 08:17:50 -0000
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: tfmorris
Date: 2007-11-11 00:17:50-0800
New Revision: 13747
Modified:
trunk/src_new/org/argouml/ui/explorer/rules/GoAssocRoleToMessages.java
trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateMachine.java
trunk/src_new/org/argouml/ui/explorer/rules/GoClassToAssociatedClass.java
trunk/src_new/org/argouml/ui/explorer/rules/GoClassToNavigableClass.java
trunk/src_new/org/argouml/ui/explorer/rules/GoClassToSummary.java
trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToBehavioralFeature.java
trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToCollaboration.java
trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToInstance.java
trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStateMachine.java
trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStructuralFeature.java
trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToInteraction.java
trunk/src_new/org/argouml/ui/explorer/rules/GoComponentToResidentModelElement.java
trunk/src_new/org/argouml/ui/explorer/rules/GoCompositeStateToSubvertex.java
trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java
trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToNode.java
trunk/src_new/org/argouml/ui/explorer/rules/GoElementToMachine.java
trunk/src_new/org/argouml/ui/explorer/rules/GoEnumerationToLiterals.java
trunk/src_new/org/argouml/ui/explorer/rules/GoGeneralizableElementToSpecialized.java
trunk/src_new/org/argouml/ui/explorer/rules/GoInteractionToMessages.java
trunk/src_new/org/argouml/ui/explorer/rules/GoLinkToStimuli.java
trunk/src_new/org/argouml/ui/explorer/rules/GoMessageToAction.java
trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToBehavior.java
trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToComment.java
trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java
trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContents.java
trunk/src_new/org/argouml/ui/explorer/rules/GoModelToBaseElements.java
trunk/src_new/org/argouml/ui/explorer/rules/GoModelToCollaboration.java
trunk/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java
trunk/src_new/org/argouml/ui/explorer/rules/GoModelToElements.java
trunk/src_new/org/argouml/ui/explorer/rules/GoModelToNode.java
trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToClassifierAndPackage.java
trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java
trunk/src_new/org/argouml/ui/explorer/rules/GoNodeToResidentComponent.java
trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaboration.java
trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToClass.java
trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToElementImport.java
trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java
trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java
trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java
trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java
trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToProfileConfiguration.java
trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToRoots.java
trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java
trunk/src_new/org/argouml/ui/explorer/rules/GoSignalToReception.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToState.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTop.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTransition.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDoActivity.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDownstream.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStateToEntry.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStateToExit.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStateToIncomingTrans.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStateToInternalTrans.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStateToOutgoingTrans.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStereotypeToTagDefinition.java
trunk/src_new/org/argouml/ui/explorer/rules/GoStimulusToAction.java
trunk/src_new/org/argouml/ui/explorer/rules/GoSubmachineStateToStateMachine.java
trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAssociation.java
trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAttribute.java
trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToIncomingDependency.java
trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToInheritance.java
trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOperation.java
trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOutgoingDependency.java
trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToGuard.java
trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToSource.java
trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToTarget.java
trunk/src_new/org/argouml/ui/explorer/rules/GoTransitiontoEffect.java
trunk/src_new/org/argouml/ui/explorer/rules/GoUseCaseToExtensionPoint.java
Log:
Return empty collections instead of nulls
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoAssocRoleToMessages.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoAssocRoleToMessages.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoAssocRoleToMessages.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoAssocRoleToMessages.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoAssocRoleToMessages.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoAssocRoleToMessages.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.association-role.messages");
+ return Translator.localize("misc.association-role.messages");
}
/*
@@ -49,7 +50,7 @@
*/
public Collection getChildren(Object parent) {
if (!Model.getFacade().isAAssociationRole(parent)) {
- return null;
+ return Collections.EMPTY_SET;
}
return Model.getFacade().getMessages(parent);
}
@@ -63,6 +64,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -62,7 +63,7 @@
}
return ret;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -70,7 +71,7 @@
*/
public Set getDependencies(Object parent) {
// TODO: what?
- return null;
+ return Collections.EMPTY_SET;
}
@@ -78,7 +79,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize (
+ return Translator.localize(
"misc.behavioral-feature.statechart-diagram");
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateMachine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateMachine.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateMachine.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateMachine.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateMachine.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateMachine.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -44,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.behavioral-feature.statemachine");
+ return Translator.localize("misc.behavioral-feature.statemachine");
}
/*
@@ -54,7 +55,7 @@
if (Model.getFacade().isABehavioralFeature(parent)) {
return Model.getFacade().getBehaviors(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -66,6 +67,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoClassToAssociatedClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoClassToAssociatedClass.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoClassToAssociatedClass.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoClassToAssociatedClass.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoClassToAssociatedClass.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoClassToAssociatedClass.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.class.associated-class");
+ return Translator.localize("misc.class.associated-class");
}
/*
@@ -51,7 +52,7 @@
if (Model.getFacade().isAClass(parent)) {
return Model.getFacade().getAssociatedClasses(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -63,6 +64,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoClassToNavigableClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoClassToNavigableClass.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoClassToNavigableClass.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoClassToNavigableClass.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoClassToNavigableClass.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoClassToNavigableClass.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -44,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.class.navigable-class");
+ return Translator.localize("misc.class.navigable-class");
}
/*
@@ -52,14 +53,14 @@
*/
public Collection getChildren(Object parent) {
if (!Model.getFacade().isAClass(parent)) {
- return null;
+ return Collections.EMPTY_SET;
}
List childClasses = new ArrayList();
Collection ends = Model.getFacade().getAssociationEnds(parent);
if (ends == null) {
- return null;
+ return Collections.EMPTY_SET;
}
Iterator it = ends.iterator();
@@ -105,6 +106,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoClassToSummary.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoClassToSummary.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoClassToSummary.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoClassToSummary.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoClassToSummary.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoClassToSummary.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -45,7 +46,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.class.summary");
+ return Translator.localize("misc.class.summary");
}
/*
@@ -79,7 +80,7 @@
return list;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -99,7 +100,7 @@
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
private boolean hasIncomingDependencies(Object parent) {
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToBehavioralFeature.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToBehavioralFeature.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToBehavioralFeature.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToBehavioralFeature.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToBehavioralFeature.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToBehavioralFeature.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -45,7 +46,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.classifier.behavioralfeature");
+ return Translator.localize("misc.classifier.behavioralfeature");
}
/*
@@ -55,7 +56,7 @@
if (Model.getFacade().isAClassifier(parent)) {
return Model.getCoreHelper().getBehavioralFeatures(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -67,6 +68,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToCollaboration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToCollaboration.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToCollaboration.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToCollaboration.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToCollaboration.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToCollaboration.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -44,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.classifier.collaboration");
+ return Translator.localize("misc.classifier.collaboration");
}
/*
@@ -54,7 +55,7 @@
if (Model.getFacade().isAClassifier(parent)) {
return Model.getFacade().getCollaborations(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -66,6 +67,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToInstance.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToInstance.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToInstance.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToInstance.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToInstance.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -40,7 +41,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.classifier.collaboration");
+ return Translator.localize("misc.classifier.collaboration");
}
/*
@@ -48,7 +49,7 @@
*/
public Collection getChildren(Object parent) {
if (!Model.getFacade().isAClassifier(parent)) {
- return null;
+ return Collections.EMPTY_SET;
}
return Model.getFacade().getInstances(parent);
}
@@ -62,6 +63,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -47,7 +48,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.classifier.sequence-diagram");
+ return Translator.localize("misc.classifier.sequence-diagram");
}
/*
@@ -71,7 +72,7 @@
return ret;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -79,6 +80,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStateMachine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStateMachine.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStateMachine.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStateMachine.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStateMachine.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStateMachine.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -44,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.classifier.statemachine");
+ return Translator.localize("misc.classifier.statemachine");
}
/*
@@ -54,7 +55,7 @@
if (Model.getFacade().isAClassifier(parent)) {
return Model.getFacade().getBehaviors(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -66,6 +67,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStructuralFeature.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStructuralFeature.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStructuralFeature.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStructuralFeature.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStructuralFeature.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToStructuralFeature.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -33,7 +34,7 @@
/**
* Rule for Class->Attribute.
- *
+ *
*/
public class GoClassifierToStructuralFeature extends AbstractPerspectiveRule {
@@ -41,17 +42,17 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.class.attribute");
+ return Translator.localize("misc.class.attribute");
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getChildren(java.lang.Object)
*/
public Collection getChildren(Object parent) {
- if (Model.getFacade().isAClassifier(parent)) {
- return Model.getFacade().getStructuralFeatures(parent);
- }
- return null;
+ if (Model.getFacade().isAClassifier(parent)) {
+ return Model.getFacade().getStructuralFeatures(parent);
+ }
+ return Collections.EMPTY_SET;
}
/*
@@ -59,10 +60,10 @@
*/
public Set getDependencies(Object parent) {
if (Model.getFacade().isAClassifier(parent)) {
- Set set = new HashSet();
- set.add(parent);
- return set;
- }
- return null;
+ Set set = new HashSet();
+ set.add(parent);
+ return set;
+ }
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -46,31 +47,33 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.collaboration.diagram");
+ return Translator.localize("misc.collaboration.diagram");
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getChildren(java.lang.Object)
*/
public Collection getChildren(Object parent) {
- if (!Model.getFacade().isACollaboration(parent))
- return null;
+ if (!Model.getFacade().isACollaboration(parent)) {
+ return Collections.EMPTY_SET;
+ }
Project p = ProjectManager.getManager().getCurrentProject();
- if (p == null)
- return null;
+ if (p == null) {
+ return Collections.EMPTY_SET;
+ }
Set<ArgoDiagram> res = new HashSet<ArgoDiagram>();
for (ArgoDiagram d : p.getDiagramList()) {
if (d instanceof UMLCollaborationDiagram
- && ((UMLCollaborationDiagram) d).getNamespace() == parent) {
+ && ((UMLCollaborationDiagram) d).getNamespace() == parent) {
res.add(d);
}
/* Also show unattached sequence diagrams: */
if ((d instanceof UMLSequenceDiagram)
- && (Model.getFacade().getRepresentedClassifier(parent) == null)
- && (Model.getFacade().getRepresentedOperation(parent) == null)
- && (parent == ((UMLSequenceDiagram) d).getNamespace())) {
+ && (Model.getFacade().getRepresentedClassifier(parent) == null)
+ && (Model.getFacade().getRepresentedOperation(parent) == null)
+ && (parent == ((UMLSequenceDiagram) d).getNamespace())) {
res.add(d);
}
}
@@ -82,6 +85,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToInteraction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToInteraction.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToInteraction.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToInteraction.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToInteraction.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoCollaborationToInteraction.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.collaboration.interaction");
+ return Translator.localize("misc.collaboration.interaction");
}
/*
@@ -50,7 +51,7 @@
*/
public Collection getChildren(Object parent) {
if (!Model.getFacade().isACollaboration(parent)) {
- return null;
+ return Collections.EMPTY_SET;
}
return Model.getFacade().getInteractions(parent);
}
@@ -65,6 +66,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoComponentToResidentModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoComponentToResidentModelElement.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoComponentToResidentModelElement.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoComponentToResidentModelElement.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoComponentToResidentModelElement.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoComponentToResidentModelElement.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
@@ -44,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.component.resident.modelelement");
+ return Translator.localize("misc.component.resident.modelelement");
}
/*
@@ -61,14 +62,14 @@
}
return result;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getDependencies(java.lang.Object)
*/
public Set getDependencies(Object parent) {
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoCompositeStateToSubvertex.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoCompositeStateToSubvertex.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoCompositeStateToSubvertex.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoCompositeStateToSubvertex.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoCompositeStateToSubvertex.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoCompositeStateToSubvertex.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state.substates");
+ return Translator.localize("misc.state.substates");
}
/*
@@ -51,7 +52,7 @@
if (Model.getFacade().isACompositeState(parent)) {
return Model.getFacade().getSubvertices(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -63,6 +64,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java 2007-11-11 00:17:50-0800
@@ -41,7 +41,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.diagram.edge");
+ return Translator.localize("misc.diagram.edge");
}
/*
@@ -51,7 +51,7 @@
if (parent instanceof Diagram) {
return ((Diagram) parent).getEdges();
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToNode.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToNode.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToNode.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToNode.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToNode.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -40,7 +41,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.diagram.node");
+ return Translator.localize("misc.diagram.node");
}
/*
@@ -50,7 +51,7 @@
if (parent instanceof Diagram) {
return ((Diagram) parent).getNodes();
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -58,6 +59,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: what?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoElementToMachine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoElementToMachine.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoElementToMachine.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoElementToMachine.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoElementToMachine.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoElementToMachine.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.class.state-machine");
+ return Translator.localize("misc.class.state-machine");
}
/*
@@ -51,7 +52,7 @@
if (Model.getFacade().isAModelElement(parent)) {
return Model.getFacade().getBehaviors(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -63,6 +64,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoEnumerationToLiterals.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoEnumerationToLiterals.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoEnumerationToLiterals.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoEnumerationToLiterals.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoEnumerationToLiterals.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoEnumerationToLiterals.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -61,14 +62,14 @@
}
return list;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.AbstractPerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.enumeration.literal");
+ return Translator.localize("misc.enumeration.literal");
}
/*
@@ -82,7 +83,7 @@
set.addAll(Model.getFacade().getEnumerationLiterals(parent));
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoGeneralizableElementToSpecialized.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoGeneralizableElementToSpecialized.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoGeneralizableElementToSpecialized.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoGeneralizableElementToSpecialized.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoGeneralizableElementToSpecialized.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoGeneralizableElementToSpecialized.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -43,7 +44,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.classifier.specialized-classifier");
+ return Translator.localize("misc.classifier.specialized-classifier");
}
/*
@@ -53,7 +54,7 @@
if (Model.getFacade().isAGeneralizableElement(parent)) {
return Model.getFacade().getChildren(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -65,8 +66,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
-} /* end class GoGenElementToDerived */
-
+}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoInteractionToMessages.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoInteractionToMessages.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoInteractionToMessages.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoInteractionToMessages.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoInteractionToMessages.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoInteractionToMessages.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -51,7 +52,7 @@
if (Model.getFacade().isAInteraction(parent)) {
return Model.getFacade().getMessages(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -63,6 +64,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoLinkToStimuli.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoLinkToStimuli.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoLinkToStimuli.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoLinkToStimuli.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoLinkToStimuli.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoLinkToStimuli.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -43,7 +44,7 @@
*/
public Collection getChildren(Object parent) {
if (!Model.getFacade().isALink(parent)) {
- return null;
+ return Collections.EMPTY_SET;
}
return Model.getFacade().getStimuli(parent);
}
@@ -52,7 +53,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.link.stimuli");
+ return Translator.localize("misc.link.stimuli");
}
/*
@@ -65,6 +66,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoMessageToAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoMessageToAction.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoMessageToAction.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoMessageToAction.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoMessageToAction.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoMessageToAction.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -44,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.message.action");
+ return Translator.localize("misc.message.action");
}
/*
@@ -62,7 +63,7 @@
}
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -75,6 +76,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToBehavior.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToBehavior.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToBehavior.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToBehavior.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToBehavior.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToBehavior.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -43,7 +44,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.model-element.behavior");
+ return Translator.localize("misc.model-element.behavior");
}
/*
@@ -53,7 +54,7 @@
if (Model.getFacade().isAModelElement(parent)) {
return Model.getFacade().getBehaviors(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -65,6 +66,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToComment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToComment.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToComment.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToComment.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToComment.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToComment.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -49,14 +50,14 @@
if (Model.getFacade().isAModelElement(parent)) {
return Model.getFacade().getComments(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.model-element.comment");
+ return Translator.localize("misc.model-element.comment");
}
/*
@@ -68,6 +69,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -65,7 +66,7 @@
}
return ret;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContents.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContents.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContents.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContents.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContents.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContents.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -57,7 +58,7 @@
if (Model.getFacade().isAModelElement(parent)) {
return Model.getFacade().getModelElementContents(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoModelToBaseElements.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoModelToBaseElements.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoModelToBaseElements.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoModelToBaseElements.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoModelToBaseElements.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoModelToBaseElements.java 2007-11-11 00:17:50-0800
@@ -26,8 +26,8 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -43,7 +43,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.package.base-class");
+ return Translator.localize("misc.package.base-class");
}
/*
@@ -51,22 +51,20 @@
*/
public Collection getChildren(Object parent) {
if (Model.getFacade().isAPackage(parent)) {
- Collection col = new ArrayList();
- Iterator it =
+ Collection result = new ArrayList();
+ Collection generalizableElements =
Model.getModelManagementHelper()
.getAllModelElementsOfKind(
parent,
- Model.getMetaTypes().getGeneralizableElement())
- .iterator();
- while (it.hasNext()) {
- Object gen = it.next();
- if (Model.getFacade().getGeneralizations(gen).isEmpty()) {
- col.add(gen);
+ Model.getMetaTypes().getGeneralizableElement());
+ for (Object element : generalizableElements) {
+ if (Model.getFacade().getGeneralizations(element).isEmpty()) {
+ result.add(element);
}
}
- return col;
+ return result;
}
- return null;
+ return Collections.EMPTY_LIST;
}
/*
@@ -78,6 +76,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoModelToCollaboration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoModelToCollaboration.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoModelToCollaboration.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoModelToCollaboration.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoModelToCollaboration.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoModelToCollaboration.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -45,7 +46,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.model.collaboration");
+ return Translator.localize("misc.model.collaboration");
}
/*
@@ -69,7 +70,7 @@
}
return returnList;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -77,6 +78,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -43,7 +44,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.model.diagram");
+ return Translator.localize("misc.model.diagram");
}
/*
@@ -56,7 +57,7 @@
return ProjectManager.getManager()
.getCurrentProject().getDiagramList();
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -68,6 +69,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoModelToElements.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoModelToElements.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoModelToElements.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoModelToElements.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoModelToElements.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoModelToElements.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.model.elements");
+ return Translator.localize("misc.model.elements");
}
/*
@@ -51,7 +52,7 @@
if (Model.getFacade().isANamespace(parent)) {
return Model.getFacade().getOwnedElements(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -63,6 +64,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoModelToNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoModelToNode.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoModelToNode.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoModelToNode.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoModelToNode.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoModelToNode.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -40,7 +41,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.model.node");
+ return Translator.localize("misc.model.node");
}
/*
@@ -53,14 +54,14 @@
parent,
Model.getMetaTypes().getNode());
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getDependencies(java.lang.Object)
*/
public Set getDependencies(Object parent) {
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToClassifierAndPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToClassifierAndPackage.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToClassifierAndPackage.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToClassifierAndPackage.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToClassifierAndPackage.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToClassifierAndPackage.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -47,7 +48,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.namespace.classifer-or-package");
+ return Translator.localize("misc.namespace.classifer-or-package");
}
/*
@@ -55,7 +56,7 @@
*/
public Collection getChildren(Object parent) {
if (!Model.getFacade().isANamespace(parent)) {
- return null;
+ return Collections.EMPTY_SET;
}
Iterator elements =
@@ -82,6 +83,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -78,7 +79,7 @@
}
return returnList;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -86,6 +87,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java 2007-11-11 00:17:50-0800
@@ -45,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.namespace.owned-element");
+ return Translator.localize("misc.namespace.owned-element");
}
/*
@@ -93,6 +93,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoNodeToResidentComponent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoNodeToResidentComponent.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoNodeToResidentComponent.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoNodeToResidentComponent.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoNodeToResidentComponent.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoNodeToResidentComponent.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -42,7 +43,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.node.resident.component");
+ return Translator.localize("misc.node.resident.component");
}
/*
@@ -52,14 +53,14 @@
if (Model.getFacade().isANode(parent)) {
return Model.getFacade().getDeployedComponents(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getDependencies(java.lang.Object)
*/
public Set getDependencies(Object parent) {
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaboration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaboration.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaboration.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaboration.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaboration.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaboration.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -45,7 +46,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.operation.collaboration");
+ return Translator.localize("misc.operation.collaboration");
}
/*
@@ -56,7 +57,7 @@
if (Model.getFacade().isAOperation(parent)) {
return Model.getFacade().getCollaborations(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -72,6 +73,6 @@
}
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -63,7 +64,7 @@
}
return ret;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -71,14 +72,14 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.operation.collaboration-diagram");
+ return Translator.localize("misc.operation.collaboration-diagram");
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -47,7 +48,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.operation.sequence-diagram");
+ return Translator.localize("misc.operation.sequence-diagram");
}
/*
@@ -72,7 +73,7 @@
}
return ret;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -80,6 +81,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToClass.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToClass.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToClass.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToClass.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToClass.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -52,7 +53,7 @@
.getAllModelElementsOfKind(parent,
Model.getMetaTypes().getUMLClass());
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -60,6 +61,6 @@
*/
public Set getDependencies(Object parent) {
// Todo: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToElementImport.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToElementImport.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToElementImport.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToElementImport.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToElementImport.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoPackageToElementImport.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -44,7 +45,7 @@
if (Model.getFacade().isAPackage(parent)) {
return Model.getFacade().getElementImports(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -58,7 +59,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getDependencies(java.lang.Object)
*/
public Set getDependencies(Object parent) {
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -40,7 +41,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.profileconfiguration.profile");
+ return Translator.localize("misc.profileconfiguration.profile");
}
/*
@@ -50,7 +51,7 @@
if (parent instanceof ProfileConfiguration) {
return ((ProfileConfiguration) parent).getProfiles();
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -58,6 +59,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.profile.model");
+ return Translator.localize("misc.profile.model");
}
/*
@@ -52,10 +53,10 @@
try {
return ((Profile) parent).getProfilePackages();
} catch (ProfileException e) {
- return null;
+ return Collections.EMPTY_SET;
}
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -63,6 +64,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -43,7 +44,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.project.collaboration");
+ return Translator.localize("misc.project.collaboration");
}
/*
@@ -70,6 +71,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -40,7 +41,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.project.diagram");
+ return Translator.localize("misc.project.diagram");
}
/*
@@ -50,7 +51,7 @@
if (parent instanceof Project) {
return ((Project) parent).getDiagramList();
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -58,6 +59,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -40,7 +41,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.project.model");
+ return Translator.localize("misc.project.model");
}
/*
@@ -50,7 +51,7 @@
if (parent instanceof Project) {
return ((Project) parent).getUserDefinedModelList();
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -58,6 +59,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToProfileConfiguration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToProfileConfiguration.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToProfileConfiguration.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToProfileConfiguration.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToProfileConfiguration.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToProfileConfiguration.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.project.profileconfiguration");
+ return Translator.localize("misc.project.profileconfiguration");
}
/*
@@ -53,7 +54,7 @@
l.add(((Project) parent).getProfileConfiguration());
return l;
}
- return null;
+ return Collections.EMPTY_LIST;
}
/*
@@ -61,6 +62,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToRoots.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToRoots.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToRoots.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToRoots.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToRoots.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToRoots.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -49,7 +50,7 @@
public String getRuleName() {
- return Translator.localize ("misc.project.roots");
+ return Translator.localize("misc.project.roots");
}
@@ -57,11 +58,11 @@
if (parent instanceof Project) {
return ((Project) parent).getRoots();
}
- return null;
+ return Collections.EMPTY_SET;
}
public Set getDependencies(Object parent) {
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -42,7 +43,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.project.state-machine");
+ return Translator.localize("misc.project.state-machine");
}
/*
@@ -65,6 +66,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoSignalToReception.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoSignalToReception.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoSignalToReception.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoSignalToReception.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoSignalToReception.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoSignalToReception.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -44,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("Signal->Reception");
+ return Translator.localize("Signal->Reception");
}
/*
@@ -54,7 +55,7 @@
if (Model.getFacade().isASignal(parent)) {
return Model.getFacade().getReceptions(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -66,6 +67,6 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToState.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToState.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToState.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToState.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToState.java 2007-11-11 00:17:50-0800
@@ -27,6 +27,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -45,7 +46,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state-machine.state");
+ return Translator.localize("misc.state-machine.state");
}
/*
@@ -60,7 +61,7 @@
Model.getFacade().getTop(parent));
}
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -76,6 +77,6 @@
}
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTop.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTop.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTop.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTop.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTop.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTop.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -43,7 +44,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state-machine.top-state");
+ return Translator.localize("misc.state-machine.top-state");
}
/*
@@ -56,7 +57,7 @@
list.add(Model.getFacade().getTop(parent));
return list;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -69,6 +70,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTransition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTransition.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTransition.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTransition.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTransition.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStateMachineToTransition.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -43,7 +44,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state-machine.transition");
+ return Translator.localize("misc.state-machine.transition");
}
/*
@@ -53,7 +54,7 @@
if (Model.getFacade().isAStateMachine(parent)) {
return Model.getFacade().getTransitions(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -65,6 +66,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDoActivity.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDoActivity.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDoActivity.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDoActivity.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDoActivity.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDoActivity.java 2007-11-11 00:17:50-0800
@@ -25,10 +25,11 @@
package org.argouml.ui.explorer.rules;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import java.util.Vector;
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
@@ -47,13 +48,13 @@
*/
public Collection getChildren(Object parent) {
if (Model.getFacade().isAState(parent)
- && Model.getFacade().getDoActivity(parent) != null) {
- Vector children = new Vector();
+ && Model.getFacade().getDoActivity(parent) != null) {
+ Collection children = new ArrayList();
children.add(Model.getFacade().getDoActivity(parent));
return children;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -65,14 +66,14 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state.do-activity");
+ return Translator.localize("misc.state.do-activity");
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDownstream.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDownstream.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDownstream.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDownstream.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDownstream.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStateToDownstream.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state.outgoing-states");
+ return Translator.localize("misc.state.outgoing-states");
}
/*
@@ -51,7 +52,7 @@
if (Model.getFacade().isAStateVertex(parent)) {
return Model.getStateMachinesHelper().getOutgoingStates(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -63,6 +64,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
-} /* end class GoStateToDownstream */
+
+}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStateToEntry.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStateToEntry.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToEntry.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToEntry.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStateToEntry.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStateToEntry.java 2007-11-11 00:17:50-0800
@@ -24,10 +24,11 @@
package org.argouml.ui.explorer.rules;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import java.util.Vector;
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
@@ -46,11 +47,11 @@
public Collection getChildren(Object parent) {
if (Model.getFacade().isAState(parent)
&& Model.getFacade().getEntry(parent) != null) {
- Vector children = new Vector();
+ Collection children = new ArrayList();
children.add(Model.getFacade().getEntry(parent));
return children;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -62,14 +63,14 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state.entry");
+ return Translator.localize("misc.state.entry");
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStateToExit.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStateToExit.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToExit.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToExit.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStateToExit.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStateToExit.java 2007-11-11 00:17:50-0800
@@ -24,10 +24,11 @@
package org.argouml.ui.explorer.rules;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import java.util.Vector;
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
@@ -46,11 +47,11 @@
public Collection getChildren(Object parent) {
if (Model.getFacade().isAState(parent)
&& Model.getFacade().getExit(parent) != null) {
- Vector children = new Vector();
+ Collection children = new ArrayList();
children.add(Model.getFacade().getExit(parent));
return children;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -62,13 +63,14 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state.exit");
+ return Translator.localize("misc.state.exit");
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStateToIncomingTrans.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStateToIncomingTrans.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToIncomingTrans.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToIncomingTrans.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStateToIncomingTrans.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStateToIncomingTrans.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state.incoming-transitions");
+ return Translator.localize("misc.state.incoming-transitions");
}
/*
@@ -51,7 +52,7 @@
if (Model.getFacade().isAStateVertex(parent)) {
return Model.getFacade().getIncomings(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -63,6 +64,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStateToInternalTrans.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStateToInternalTrans.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToInternalTrans.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToInternalTrans.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStateToInternalTrans.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStateToInternalTrans.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state.internal-transitions");
+ return Translator.localize("misc.state.internal-transitions");
}
/*
@@ -51,7 +52,7 @@
if (Model.getFacade().isAState(parent)) {
return Model.getFacade().getInternalTransitions(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -63,6 +64,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
-} /* end class GoStateToInternalTrans */
+
+}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStateToOutgoingTrans.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStateToOutgoingTrans.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToOutgoingTrans.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStateToOutgoingTrans.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStateToOutgoingTrans.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStateToOutgoingTrans.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state.outgoing-transitions");
+ return Translator.localize("misc.state.outgoing-transitions");
}
/*
@@ -51,7 +52,7 @@
if (Model.getFacade().isAStateVertex(parent)) {
return Model.getFacade().getOutgoings(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -63,6 +64,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
-} /* end class GoStateToOutgoingTrans */
+
+}
\ No newline at end of file
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -73,21 +74,21 @@
}
return returnList;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.state-machine.diagram");
+ return Translator.localize("misc.state-machine.diagram");
}
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getDependencies(java.lang.Object)
*/
public Set getDependencies(Object parent) {
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStereotypeToTagDefinition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStereotypeToTagDefinition.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStereotypeToTagDefinition.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStereotypeToTagDefinition.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStereotypeToTagDefinition.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStereotypeToTagDefinition.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -47,9 +48,10 @@
/*
* @see org.argouml.ui.explorer.rules.AbstractPerspectiveRule#getChildren(java.lang.Object)
*/
- public Collection getChildren(Object parent) {
+ @Override
+ public Collection getChildren(final Object parent) {
if (Model.getFacade().isAStereotype(parent)) {
- List list = new ArrayList();
+ final List list = new ArrayList();
if (Model.getFacade().getTagDefinitions(parent) != null
&& Model.getFacade().getTagDefinitions(parent).size() > 0) {
@@ -57,12 +59,13 @@
}
return list;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
* @see org.argouml.ui.explorer.rules.AbstractPerspectiveRule#getRuleName()
*/
+ @Override
public String getRuleName() {
return "Stereotype->TagDefinition";
}
@@ -70,6 +73,7 @@
/*
* @see org.argouml.ui.explorer.rules.AbstractPerspectiveRule#toString()
*/
+ @Override
public String toString() {
return super.toString();
}
@@ -77,14 +81,14 @@
/*
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getDependencies(java.lang.Object)
*/
- public Set getDependencies(Object parent) {
+ public Set getDependencies(final Object parent) {
if (Model.getFacade().isAStereotype(parent)) {
- Set set = new HashSet();
+ final Set set = new HashSet();
set.add(parent);
set.addAll(Model.getFacade().getTagDefinitions(parent));
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoStimulusToAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoStimulusToAction.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoStimulusToAction.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoStimulusToAction.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoStimulusToAction.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoStimulusToAction.java 2007-11-11 00:17:50-0800
@@ -24,7 +24,9 @@
package org.argouml.ui.explorer.rules;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.Vector;
@@ -42,13 +44,14 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getChildren(java.lang.Object)
*/
public Collection getChildren(Object parent) {
- if (!Model.getFacade().isAStimulus(parent))
- return null;
+ if (!Model.getFacade().isAStimulus(parent)) {
+ return Collections.EMPTY_SET;
+ }
Object ms = parent;
Object action = Model.getFacade().getDispatchAction(ms);
- Vector vector = new Vector();
- vector.addElement(action);
- return vector;
+ Collection result = new ArrayList();
+ result.add(action);
+ return result;
}
@@ -61,7 +64,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -70,4 +73,5 @@
public String getRuleName() {
return Translator.localize("misc.stimulus.action");
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoSubmachineStateToStateMachine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoSubmachineStateToStateMachine.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoSubmachineStateToStateMachine.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoSubmachineStateToStateMachine.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoSubmachineStateToStateMachine.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoSubmachineStateToStateMachine.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -58,7 +59,7 @@
list.add(Model.getFacade().getSubmachine(parent));
return list;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -71,6 +72,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAssociation.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAssociation.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAssociation.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAssociation.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAssociation.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -44,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.summary.association");
+ return Translator.localize("misc.summary.association");
}
/*
@@ -55,7 +56,7 @@
return Model.getCoreHelper()
.getAssociations(((AssociationsNode) parent).getParent());
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -67,6 +68,7 @@
set.add(((AssociationsNode) parent).getParent());
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAttribute.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAttribute.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAttribute.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAttribute.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAttribute.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToAttribute.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -44,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.summary.attribute");
+ return Translator.localize("misc.summary.attribute");
}
/*
@@ -55,7 +56,7 @@
return Model.getFacade().getAttributes(((AttributesNode) parent)
.getParent());
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -67,6 +68,7 @@
set.add(((AttributesNode) parent).getParent());
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToIncomingDependency.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToIncomingDependency.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToIncomingDependency.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToIncomingDependency.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToIncomingDependency.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToIncomingDependency.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -47,7 +48,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.summary.incoming-dependency");
+ return Translator.localize("misc.summary.incoming-dependency");
}
/*
@@ -72,7 +73,7 @@
return list;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -84,6 +85,7 @@
set.add(((IncomingDependencyNode) parent).getParent());
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToInheritance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToInheritance.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToInheritance.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToInheritance.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToInheritance.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToInheritance.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -47,7 +48,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.summary.inheritance");
+ return Translator.localize("misc.summary.inheritance");
}
/*
@@ -97,7 +98,7 @@
return list;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -109,6 +110,7 @@
set.add(((InheritanceNode) parent).getParent());
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOperation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOperation.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOperation.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOperation.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOperation.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOperation.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -44,7 +45,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.summary.operation");
+ return Translator.localize("misc.summary.operation");
}
/*
@@ -52,10 +53,10 @@
*/
public Collection getChildren(Object parent) {
if (parent instanceof OperationsNode) {
- return Model.getFacade().getOperations(
- ((OperationsNode) parent).getParent());
- }
- return null;
+ return Model.getFacade().getOperations(
+ ((OperationsNode) parent).getParent());
+ }
+ return Collections.EMPTY_SET;
}
/*
@@ -67,6 +68,7 @@
set.add(((OperationsNode) parent).getParent());
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOutgoingDependency.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOutgoingDependency.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOutgoingDependency.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOutgoingDependency.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOutgoingDependency.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoSummaryToOutgoingDependency.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -47,7 +48,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.summary.outgoing-dependency");
+ return Translator.localize("misc.summary.outgoing-dependency");
}
/*
@@ -56,7 +57,7 @@
*/
public Collection getChildren(Object parent) {
if (parent instanceof OutgoingDependencyNode) {
- List list = new ArrayList();
+ Collection list = new ArrayList();
Iterator it =
Model.getFacade().getClientDependencies(
((OutgoingDependencyNode) parent).getParent())
@@ -71,7 +72,7 @@
return list;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -84,6 +85,7 @@
set.add(((OutgoingDependencyNode) parent).getParent());
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToGuard.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToGuard.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToGuard.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToGuard.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToGuard.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -55,7 +56,7 @@
col.add(Model.getFacade().getGuard(parent));
return col;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -67,6 +68,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToSource.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToSource.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToSource.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToSource.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToSource.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToSource.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -53,7 +54,7 @@
col.add(Model.getFacade().getSource(parent));
return col;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -65,6 +66,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToTarget.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToTarget.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToTarget.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToTarget.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToTarget.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoTransitionToTarget.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -42,7 +43,7 @@
* @see org.argouml.ui.explorer.rules.PerspectiveRule#getRuleName()
*/
public String getRuleName() {
- return Translator.localize ("misc.transition.target-state");
+ return Translator.localize("misc.transition.target-state");
}
/*
@@ -54,7 +55,7 @@
col.add(Model.getFacade().getTarget(parent));
return col;
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -66,6 +67,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoTransitiontoEffect.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoTransitiontoEffect.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoTransitiontoEffect.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoTransitiontoEffect.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoTransitiontoEffect.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoTransitiontoEffect.java 2007-11-11 00:17:50-0800
@@ -26,6 +26,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -58,7 +59,7 @@
return col;
}
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -70,6 +71,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
+
}
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoUseCaseToExtensionPoint.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoUseCaseToExtensionPoint.java?view=diff&rev=13747&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoUseCaseToExtensionPoint.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoUseCaseToExtensionPoint.java&r1=13746&r2=13747
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoUseCaseToExtensionPoint.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoUseCaseToExtensionPoint.java 2007-11-11 00:17:50-0800
@@ -25,6 +25,7 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -45,7 +46,7 @@
* Point</code>").
*/
public String getRuleName() {
- return Translator.localize ("misc.use-case.extension-point");
+ return Translator.localize("misc.use-case.extension-point");
}
/*
@@ -55,7 +56,7 @@
if (Model.getFacade().isAUseCase(parent)) {
return Model.getFacade().getExtensionPoints(parent);
}
- return null;
+ return Collections.EMPTY_SET;
}
/*
@@ -67,7 +68,7 @@
set.add(parent);
return set;
}
- return null;
+ return Collections.EMPTY_SET;
}
-} /* End of class GoUseCaseToExtensionPoint */
+}