svn commit: r19614 - trunk/src/argouml-app: src/org/argouml/application src/org/argouml/application/helpers src/org/argouml/cognitive src/org/argouml/cognitive/checklist src/org/argouml/cognitive/critics src/org/argouml/cognitive/critics/ui src/org/argouml/cognitive/ui src/org/argouml/gefext src/org/argouml/kernel src/org/argouml/notation src/org/argouml/notation/providers src/org/argouml/notation/providers/java src/org/argouml/notation/providers/uml src/org/argouml/persistence src/org/argouml/profile src/org/argouml/profile/internal src/org/argouml/profile/internal/ocl/uml14 src/org/argouml/swingext src/org/argouml/ui src/org/argouml/ui/cmd src/org/argouml/ui/explorer src/org/argouml/ui/explorer/rules src/org/argouml/uml src/org/argouml/uml/cognitive/critics src/org/argouml/uml/diagram src/org/argouml/uml/diagram/collaboration/ui src/org/argouml/uml/diagram/state/
[email protected] Wed, 20 Jul 2011 05:10:14 -0700 (PDT)
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: linus
Date: 2011-07-20 05:10:13-0700
New Revision: 19614
Modified:
trunk/src/argouml-app/src/org/argouml/application/Main.java
trunk/src/argouml-app/src/org/argouml/application/SubsystemUtility.java
trunk/src/argouml-app/src/org/argouml/application/helpers/ResourceLoader.java
trunk/src/argouml-app/src/org/argouml/cognitive/ListSet.java
trunk/src/argouml-app/src/org/argouml/cognitive/checklist/Checklist.java
trunk/src/argouml-app/src/org/argouml/cognitive/critics/Wizard.java
trunk/src/argouml-app/src/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java
trunk/src/argouml-app/src/org/argouml/cognitive/critics/ui/TableModelCritics.java
trunk/src/argouml-app/src/org/argouml/cognitive/ui/ActionSnooze.java
trunk/src/argouml-app/src/org/argouml/cognitive/ui/AddToDoItemDialog.java
trunk/src/argouml-app/src/org/argouml/cognitive/ui/GoListToOffenderToItem.java
trunk/src/argouml-app/src/org/argouml/cognitive/ui/ToDoByGoal.java
trunk/src/argouml-app/src/org/argouml/cognitive/ui/ToDoTreeRenderer.java
trunk/src/argouml-app/src/org/argouml/gefext/ArgoModeCreateFigLine.java
trunk/src/argouml-app/src/org/argouml/kernel/ActionList.java
trunk/src/argouml-app/src/org/argouml/kernel/DefaultUndoManager.java
trunk/src/argouml-app/src/org/argouml/kernel/ProjectManager.java
trunk/src/argouml-app/src/org/argouml/kernel/UmlModelMutator.java
trunk/src/argouml-app/src/org/argouml/notation/NotationRenderer.java
trunk/src/argouml-app/src/org/argouml/notation/providers/NotationUtilityProviders.java
trunk/src/argouml-app/src/org/argouml/notation/providers/java/NotationUtilityJava.java
trunk/src/argouml-app/src/org/argouml/notation/providers/java/OperationNotationJava.java
trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java
trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java
trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java
trunk/src/argouml-app/src/org/argouml/persistence/PgmlUtility.java
trunk/src/argouml-app/src/org/argouml/persistence/ToDoItemXMLHelper.java
trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java
trunk/src/argouml-app/src/org/argouml/persistence/XMLTokenTableBase.java
trunk/src/argouml-app/src/org/argouml/profile/UserDefinedProfile.java
trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileMeta.java
trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/OclAPIModelInterpreter.java
trunk/src/argouml-app/src/org/argouml/swingext/JLinkButton.java
trunk/src/argouml-app/src/org/argouml/ui/AboutBox.java
trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java
trunk/src/argouml-app/src/org/argouml/ui/ContextActionFactoryManager.java
trunk/src/argouml-app/src/org/argouml/ui/DetailsPane.java
trunk/src/argouml-app/src/org/argouml/ui/HelpBox.java
trunk/src/argouml-app/src/org/argouml/ui/LoadSwingWorker.java
trunk/src/argouml-app/src/org/argouml/ui/MultiEditorPane.java
trunk/src/argouml-app/src/org/argouml/ui/SaveSwingWorker.java
trunk/src/argouml-app/src/org/argouml/ui/SplashScreen.java
trunk/src/argouml-app/src/org/argouml/ui/StatusBar.java
trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigRRect.java
trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java
trunk/src/argouml-app/src/org/argouml/ui/UndoableAction.java
trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionHelp.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerTreeNode.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/TypeThenNameOrder.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoClassToSummary.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoModelElementToTemplateParameter.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoModelToDiagrams.java
trunk/src/argouml-app/src/org/argouml/uml/DocumentationManager.java
trunk/src/argouml-app/src/org/argouml/uml/ProjectMemberModel.java
trunk/src/argouml-app/src/org/argouml/uml/UUIDHelper.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClClassName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClOperationCompartment.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassWithoutComponent.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentWithoutNode.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInstanceWithoutClassifier.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceWithoutComponent.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflict.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOperations.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodeInsideElement.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrObjectWithoutClassifier.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrWrongLinkEnds.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/UMLWizard.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizMEName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizManyNames.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizTooMany.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ExtensionPointsCompartmentContainer.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigRegion.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigVertex.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigFeature.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigDependency.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigExtensionPointsCompartment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigTextGroup.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeLabelDrag.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/StylePanelFigMessage.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionAddDiagram.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionCollaborationDiagram.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRemoveModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionReopenProject.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSetMultiplicity.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java
trunk/src/argouml-app/src/org/argouml/uml/ui/TabProps.java
trunk/src/argouml-app/src/org/argouml/uml/ui/UMLEditableComboBox.java
trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java
trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeListModel.java
trunk/src/argouml-app/src/org/argouml/uml/ui/UMLTableCellRenderer.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/ActionAddEventAsTrigger.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionAddMessagePredecessor.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewActionSequence.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewCallAction.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewCreateAction.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewDestroyAction.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewReturnAction.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewSendAction.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewTerminateAction.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewUninterpretedAction.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionAddEventAsDeferrableEvent.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionSetStubStateReferenceState.java
trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ButtonActionNewGuard.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddDataType.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumeration.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java
trunk/src/argouml-app/src/org/argouml/util/CustomSeparator.java
trunk/src/argouml-app/src/org/argouml/util/MyTokenizer.java
trunk/src/argouml-app/tests/org/argouml/cognitive/checklist/TestCheckItem.java
trunk/src/argouml-app/tests/org/argouml/model/TestModelEventPump.java
trunk/src/argouml-app/tests/org/argouml/notation/TestNotationProvider.java
trunk/src/argouml-app/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java
trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestActionStateNotationUml.java
trunk/src/argouml-app/tests/org/argouml/profile/ProfileMother.java
trunk/src/argouml-app/tests/org/argouml/uml/TestStereotypeUtility.java
trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/extension_mechanisms/TestUMLTagDefinitionComboBoxModel.java
trunk/src/argouml-app/tests/org/argouml/util/CheckResourceBundle.java
Log:
Fixed some style problems. Focused on forgotten braces for if/else/for/while blocks.
Modified: trunk/src/argouml-app/src/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/Main.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/application/Main.java (original)
+++ trunk/src/argouml-app/src/org/argouml/application/Main.java 2011-07-20 05:10:13-0700
@@ -258,9 +258,11 @@
Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
// Andreas: just temporary: a warning dialog for uml2...
- if( showUml2warning && Model.getFacade().getUmlVersion().startsWith("2")) {
+ if (showUml2warning
+ && Model.getFacade().getUmlVersion().startsWith("2")) {
JOptionPane.showMessageDialog( ArgoFrame.getFrame()
- , "You are running an experimental version not meant for productive work!"
+ , "You are running an experimental version "
+ + "not meant for productive work!"
, "UML2 pre-alpha warning"
, JOptionPane.WARNING_MESSAGE);
}
@@ -393,8 +395,9 @@
PrintManager.getInstance().print();
// nothing else to do (?)
System.exit(0);
- } else if (args[i].equalsIgnoreCase("-nouml2warning")) { // Andreas: just temporary for the
- showUml2warning = false; // uml2 pre-alpha versions!
+ } else if (args[i].equalsIgnoreCase("-nouml2warning")) {
+ // Andreas: just temporary for the uml2 pre-alpha versions!
+ showUml2warning = false;
} else {
System.err.println("Ignoring unknown/incomplete option '"
+ args[i] + "'");
@@ -866,8 +869,9 @@
pb.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
// Set the screen layout to what the user left it before, or
// to reasonable defaults.
- Rectangle scrSize = GraphicsEnvironment.getLocalGraphicsEnvironment()
- .getMaximumWindowBounds();
+ Rectangle scrSize =
+ GraphicsEnvironment.getLocalGraphicsEnvironment()
+ .getMaximumWindowBounds();
int configFrameWidth =
Configuration.getInteger(Argo.KEY_SCREEN_WIDTH, scrSize.width);
@@ -893,10 +897,10 @@
UIManager.put("Button.focusInputMap", new UIDefaults.LazyInputMap(
new Object[] {
- "ENTER", "pressed",
- "released ENTER", "released",
- "SPACE", "pressed",
- "released SPACE", "released"
+ "ENTER", "pressed",
+ "released ENTER", "released",
+ "SPACE", "pressed",
+ "released SPACE", "released"
})
);
return pb;
Modified: trunk/src/argouml-app/src/org/argouml/application/SubsystemUtility.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/SubsystemUtility.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/application/SubsystemUtility.java (original)
+++ trunk/src/argouml-app/src/org/argouml/application/SubsystemUtility.java 2011-07-20 05:10:13-0700
@@ -62,11 +62,13 @@
static void initSubsystem(InitSubsystem subsystem) {
subsystem.init();
for (GUISettingsTabInterface tab : subsystem.getSettingsTabs()) {
- // TODO: This work should be deferred until actually needed for display
+ // TODO: This work should be deferred until actually
+ // needed for display
GUI.getInstance().addSettingsTab(tab);
}
for (GUISettingsTabInterface tab : subsystem.getProjectSettingsTabs()) {
- // TODO: This work should be deferred until actually needed for display
+ // TODO: This work should be deferred until actually
+ // needed for display
GUI.getInstance().addProjectSettingsTab(tab);
}
for (AbstractArgoJPanel tab : subsystem.getDetailsTabs()) {
Modified: trunk/src/argouml-app/src/org/argouml/application/helpers/ResourceLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/helpers/ResourceLoader.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/application/helpers/ResourceLoader.java (original)
+++ trunk/src/argouml-app/src/org/argouml/application/helpers/ResourceLoader.java 2011-07-20 05:10:13-0700
@@ -233,7 +233,9 @@
int len = s.length();
int pos = 0;
for (int i = 0; i < len; i++, pos++) {
- if (!Character.isJavaIdentifierPart(s.charAt(i))) break;
+ if (!Character.isJavaIdentifierPart(s.charAt(i))) {
+ break;
+ }
}
if (pos == len) {
return s;
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/ListSet.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/ListSet.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/ListSet.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/ListSet.java 2011-07-20 05:10:13-0700
@@ -242,13 +242,13 @@
if (!(o instanceof ListSet)) {
return false;
}
- ListSet set = (ListSet) o;
- if (set.size() != size()) {
+ ListSet oSet = (ListSet) o;
+ if (oSet.size() != size()) {
return false;
}
synchronized (list) {
for (Object obj : list) {
- if (!(set.contains(obj))) {
+ if (!(oSet.contains(obj))) {
return false;
}
}
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/checklist/Checklist.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/checklist/Checklist.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/checklist/Checklist.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/checklist/Checklist.java 2011-07-20 05:10:13-0700
@@ -40,10 +40,7 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
import java.util.List;
-import java.util.Vector;
/**
* A Checklist is basically a list of CheckItems. It also provides
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/critics/Wizard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/critics/Wizard.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/critics/Wizard.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/critics/Wizard.java 2011-07-20 05:10:13-0700
@@ -188,9 +188,13 @@
*/
public void back() {
step--;
- if (step < 0) step = 0;
+ if (step < 0) {
+ step = 0;
+ }
undoAction(step);
- if (item != null) item.changed();
+ if (item != null) {
+ item.changed();
+ }
}
/**
@@ -222,7 +226,9 @@
int numSteps = getNumSteps();
for (int i = step; i <= numSteps; i++) {
doAction(i);
- if (item != null) item.changed();
+ if (item != null) {
+ item.changed();
+ }
}
// TODO: do all following steps
// TODO: resolve item from ToDoList
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java 2011-07-20 05:10:13-0700
@@ -365,31 +365,44 @@
}
private void setTargetHeadline() {
- if (target == null) return;
+ if (target == null) {
+ return;
+ }
String h = headline.getText();
target.setHeadline(h);
}
private void setTargetPriority() {
- if (target == null) return;
+ if (target == null) {
+ return;
+ }
String p = (String) priority.getSelectedItem();
- if (p == null) return;
- if (p.equals(PRIORITIES[0]))
+ if (p == null) {
+ return;
+ }
+ if (p.equals(PRIORITIES[0])) {
target.setPriority(ToDoItem.HIGH_PRIORITY);
- if (p.equals(PRIORITIES[1]))
+ }
+ if (p.equals(PRIORITIES[1])) {
target.setPriority(ToDoItem.MED_PRIORITY);
- if (p.equals(PRIORITIES[2]))
+ }
+ if (p.equals(PRIORITIES[2])) {
target.setPriority(ToDoItem.LOW_PRIORITY);
+ }
}
private void setTargetMoreInfo() {
- if (target == null) return;
+ if (target == null) {
+ return;
+ }
String mi = moreInfo.getText();
target.setMoreInfoURL(mi);
}
private void setTargetDesc() {
- if (target == null) return;
+ if (target == null) {
+ return;
+ }
String d = desc.getText();
target.setDescription(d);
}
@@ -436,7 +449,9 @@
* @see javax.swing.event.ListSelectionListener#valueChanged(javax.swing.event.ListSelectionEvent)
*/
public void valueChanged(ListSelectionEvent lse) {
- if (lse.getValueIsAdjusting()) return;
+ if (lse.getValueIsAdjusting()) {
+ return;
+ }
Object src = lse.getSource();
if (src != table.getSelectionModel()) {
LOG.debug("src = " + src);
@@ -471,9 +486,15 @@
Document hDoc = headline.getDocument();
Document miDoc = moreInfo.getDocument();
Document dDoc = desc.getDocument();
- if (e.getDocument() == hDoc) setTargetHeadline();
- if (e.getDocument() == miDoc) setTargetMoreInfo();
- if (e.getDocument() == dDoc) setTargetDesc();
+ if (e.getDocument() == hDoc) {
+ setTargetHeadline();
+ }
+ if (e.getDocument() == miDoc) {
+ setTargetMoreInfo();
+ }
+ if (e.getDocument() == dDoc) {
+ setTargetDesc();
+ }
}
/*
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/critics/ui/TableModelCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/critics/ui/TableModelCritics.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/critics/ui/TableModelCritics.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/critics/ui/TableModelCritics.java 2011-07-20 05:10:13-0700
@@ -107,20 +107,26 @@
* @see javax.swing.table.TableModel#getColumnName(int)
*/
public String getColumnName(int c) {
- if (c == 0)
+ if (c == 0) {
return Translator.localize("dialog.browse.column-name.active");
- if (c == 1)
+ }
+ if (c == 1) {
return Translator.localize("dialog.browse.column-name.headline");
- if (c == 2)
+ }
+ if (c == 2) {
return Translator.localize("dialog.browse.column-name.snoozed");
- if (c == 3)
+ }
+ if (c == 3) {
return Translator.localize("dialog.browse.column-name.priority");
- if (c == 4)
+ }
+ if (c == 4) {
return Translator.localize(
"dialog.browse.column-name.supported-decision");
- if (c == 5)
+ }
+ if (c == 5) {
return Translator.localize(
"dialog.browse.column-name.knowledge-type");
+ }
throw new IllegalArgumentException();
}
@@ -160,7 +166,9 @@
* @see javax.swing.table.TableModel#getRowCount()
*/
public int getRowCount() {
- if (critics == null) return 0;
+ if (critics == null) {
+ return 0;
+ }
return critics.size();
}
@@ -169,12 +177,24 @@
*/
public Object getValueAt(int row, int col) {
Critic cr = critics.get(row);
- if (col == 0) return cr.isEnabled() ? Boolean.TRUE : Boolean.FALSE;
- if (col == 1) return cr.getHeadline();
- if (col == 2) return cr.isActive() ? "no" : "yes";
- if (col == 3) return cr.getPriority();
- if (col == 4) return listToString(cr.getSupportedDecisions());
- if (col == 5) return listToString(cr.getKnowledgeTypes());
+ if (col == 0) {
+ return cr.isEnabled() ? Boolean.TRUE : Boolean.FALSE;
+ }
+ if (col == 1) {
+ return cr.getHeadline();
+ }
+ if (col == 2) {
+ return cr.isActive() ? "no" : "yes";
+ }
+ if (col == 3) {
+ return cr.getPriority();
+ }
+ if (col == 4) {
+ return listToString(cr.getSupportedDecisions());
+ }
+ if (col == 5) {
+ return listToString(cr.getKnowledgeTypes());
+ }
throw new IllegalArgumentException();
}
@@ -186,8 +206,9 @@
Object o = i.next();
buf.append(String.valueOf(o));
hasNext = i.hasNext();
- if (hasNext)
+ if (hasNext) {
buf.append(", ");
+ }
}
return buf.toString();
}
@@ -197,8 +218,12 @@
*/
public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
LOG.debug("setting table value " + rowIndex + ", " + columnIndex);
- if (columnIndex != 0) return;
- if (!(aValue instanceof Boolean)) return;
+ if (columnIndex != 0) {
+ return;
+ }
+ if (!(aValue instanceof Boolean)) {
+ return;
+ }
Boolean enable = (Boolean) aValue;
Critic cr = critics.get(rowIndex);
cr.setEnabled(enable.booleanValue());
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/ui/ActionSnooze.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/ui/ActionSnooze.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/ui/ActionSnooze.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/ui/ActionSnooze.java 2011-07-20 05:10:13-0700
@@ -62,7 +62,9 @@
@Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
- if (!(getRememberedTarget() instanceof ToDoItem)) return;
+ if (!(getRememberedTarget() instanceof ToDoItem)) {
+ return;
+ }
ToDoItem item = (ToDoItem) getRememberedTarget();
Poster p = item.getPoster();
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/ui/AddToDoItemDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/ui/AddToDoItemDialog.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/ui/AddToDoItemDialog.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/ui/AddToDoItemDialog.java 2011-07-20 05:10:13-0700
@@ -192,7 +192,8 @@
newOffenders.add(offenderList.getModel().getElementAt(i));
}
ToDoItem item =
- new UMLToDoItem(designer, headline, priority, desc, moreInfoURL, newOffenders);
+ new UMLToDoItem(designer, headline, priority,
+ desc, moreInfoURL, newOffenders);
designer.getToDoList().addElement(item); //? inform()
Designer.firePropertyChange(Designer.MODEL_TODOITEM_ADDED, null, item);
}
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/ui/GoListToOffenderToItem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/ui/GoListToOffenderToItem.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/ui/GoListToOffenderToItem.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/ui/GoListToOffenderToItem.java 2011-07-20 05:10:13-0700
@@ -66,7 +66,7 @@
* The constructor.
*/
public GoListToOffenderToItem() {
- setListPredicate((org.argouml.util.Predicate) new PredicateNotInTrash());
+ setListPredicate(new PredicateNotInTrash());
}
////////////////////////////////////////////////////////////////
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/ui/ToDoByGoal.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/ui/ToDoByGoal.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/ui/ToDoByGoal.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/ui/ToDoByGoal.java 2011-07-20 05:10:13-0700
@@ -84,7 +84,9 @@
}
nMatchingItems++;
}
- if (nMatchingItems == 0) continue;
+ if (nMatchingItems == 0) {
+ continue;
+ }
int[] childIndices = new int[nMatchingItems];
Object[] children = new Object[nMatchingItems];
nMatchingItems = 0;
@@ -148,9 +150,13 @@
LOG.debug("toDoItemRemoved updating decision node!");
boolean anyInGoal = false;
for (ToDoItem item : tde.getToDoItemList()) {
- if (item.supports(g)) anyInGoal = true;
+ if (item.supports(g)) {
+ anyInGoal = true;
+ }
+ }
+ if (!anyInGoal) {
+ continue;
}
- if (!anyInGoal) continue;
path[1] = g;
//fireTreeNodesChanged(this, path, childIndices, children);
fireTreeStructureChanged(path);
Modified: trunk/src/argouml-app/src/org/argouml/cognitive/ui/ToDoTreeRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/cognitive/ui/ToDoTreeRenderer.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/cognitive/ui/ToDoTreeRenderer.java (original)
+++ trunk/src/argouml-app/src/org/argouml/cognitive/ui/ToDoTreeRenderer.java 2011-07-20 05:10:13-0700
@@ -114,19 +114,33 @@
ToDoItem item = (ToDoItem) value;
Poster post = item.getPoster();
if (post instanceof Designer) {
- if (item.getProgress() == 0) lab.setIcon(postItD0);
- else if (item.getProgress() <= 25) lab.setIcon(postItD25);
- else if (item.getProgress() <= 50) lab.setIcon(postItD50);
- else if (item.getProgress() <= 75) lab.setIcon(postItD75);
- else if (item.getProgress() <= 100) lab.setIcon(postItD99);
- else lab.setIcon(postItD100);
+ if (item.getProgress() == 0) {
+ lab.setIcon(postItD0);
+ } else if (item.getProgress() <= 25) {
+ lab.setIcon(postItD25);
+ } else if (item.getProgress() <= 50) {
+ lab.setIcon(postItD50);
+ } else if (item.getProgress() <= 75) {
+ lab.setIcon(postItD75);
+ } else if (item.getProgress() <= 100) {
+ lab.setIcon(postItD99);
+ } else {
+ lab.setIcon(postItD100);
+ }
} else {
- if (item.getProgress() == 0) lab.setIcon(postIt0);
- else if (item.getProgress() <= 25) lab.setIcon(postIt25);
- else if (item.getProgress() <= 50) lab.setIcon(postIt50);
- else if (item.getProgress() <= 75) lab.setIcon(postIt75);
- else if (item.getProgress() <= 100) lab.setIcon(postIt99);
- else lab.setIcon(postIt100);
+ if (item.getProgress() == 0) {
+ lab.setIcon(postIt0);
+ } else if (item.getProgress() <= 25) {
+ lab.setIcon(postIt25);
+ } else if (item.getProgress() <= 50) {
+ lab.setIcon(postIt50);
+ } else if (item.getProgress() <= 75) {
+ lab.setIcon(postIt75);
+ } else if (item.getProgress() <= 100) {
+ lab.setIcon(postIt99);
+ } else {
+ lab.setIcon(postIt100);
+ }
}
} else if (value instanceof Decision) {
Modified: trunk/src/argouml-app/src/org/argouml/gefext/ArgoModeCreateFigLine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/gefext/ArgoModeCreateFigLine.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/gefext/ArgoModeCreateFigLine.java (original)
+++ trunk/src/argouml-app/src/org/argouml/gefext/ArgoModeCreateFigLine.java 2011-07-20 05:10:13-0700
@@ -41,7 +41,6 @@
import java.awt.event.MouseEvent;
import org.argouml.i18n.Translator;
-import org.argouml.uml.diagram.ui.ArgoFig;
import org.tigris.gef.base.ModeCreateFigLine;
import org.tigris.gef.presentation.Fig;
Modified: trunk/src/argouml-app/src/org/argouml/kernel/ActionList.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/ActionList.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/ActionList.java (original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ActionList.java 2011-07-20 05:10:13-0700
@@ -31,7 +31,6 @@
* a submenu node or dropdown toolbutton and contains a list of further
* Actions to be contained in that subnode.
*
- * @param <E>
* @author Bob Tarling
*/
public class ActionList extends ArrayList<Action> implements Action {
Modified: trunk/src/argouml-app/src/org/argouml/kernel/DefaultUndoManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/DefaultUndoManager.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/DefaultUndoManager.java (original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/DefaultUndoManager.java 2011-07-20 05:10:13-0700
@@ -97,7 +97,7 @@
/**
* @deprecated in 0.32 alpha by Bob Tarling use DefaultUndoManager(Project)
*/
- @Deprecated
+ @Deprecated
private DefaultUndoManager() {
super();
project = null;
@@ -111,7 +111,7 @@
/**
* @deprecated in 0.32 alpha by Bob Tarling use DefaultUndoManager(Project)
*/
- @Deprecated
+ @Deprecated
public static UndoManager getInstance() {
return INSTANCE;
}
Modified: trunk/src/argouml-app/src/org/argouml/kernel/ProjectManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/ProjectManager.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/ProjectManager.java (original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ProjectManager.java 2011-07-20 05:10:13-0700
@@ -49,9 +49,6 @@
import javax.swing.event.EventListenerList;
import org.apache.log4j.Logger;
-import org.argouml.application.events.ArgoEventPump;
-import org.argouml.application.events.ArgoEventTypes;
-import org.argouml.application.events.ArgoStatusEvent;
import org.argouml.cognitive.Designer;
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
@@ -350,7 +347,7 @@
* default diagram (Class)
* @return Project the newly created profile project
*/
- public Project makeEmptyProfileProject(final boolean addDefaultDiagrams) {
+ public Project makeEmptyProfileProject(final boolean addDefaultDiagrams) {
final Command cmd = new NonUndoableCommand() {
@Override
Modified: trunk/src/argouml-app/src/org/argouml/kernel/UmlModelMutator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/UmlModelMutator.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/UmlModelMutator.java (original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/UmlModelMutator.java 2011-07-20 05:10:13-0700
@@ -51,4 +51,4 @@
*/
@Inherited
@Retention(RetentionPolicy.RUNTIME)
-public @interface UmlModelMutator {};
+public @interface UmlModelMutator { }
Modified: trunk/src/argouml-app/src/org/argouml/notation/NotationRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/NotationRenderer.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/NotationRenderer.java (original)
+++ trunk/src/argouml-app/src/org/argouml/notation/NotationRenderer.java 2011-07-20 05:10:13-0700
@@ -17,8 +17,9 @@
* An interface to be implemented by Objects that wish to render a
* string-representation for an UML modelElement. <p>
*
- * The Object will be notified of model changes that cause a redraw of the string.
- * <p>
+ * The Object will be notified of model changes that cause
+ * a redraw of the string.<p>
+ *
* These functions have the NotationProvider as a parameter, since
* the Object may have multiple NotationProviders, and may need
* to keep track which of their strings to refresh.
Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/NotationUtilityProviders.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/NotationUtilityProviders.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/NotationUtilityProviders.java (original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/NotationUtilityProviders.java 2011-07-20 05:10:13-0700
@@ -49,7 +49,7 @@
addListenersForAction(np, effect);
}
- static private void addListenersForEvent(NotationProvider np,
+ private static void addListenersForEvent(NotationProvider np,
Object event) {
if (event != null) {
if (Model.getFacade().isAEvent(event)) {
@@ -80,8 +80,8 @@
if (action != null) {
np.addElementListener(action,
new String[] {
- "script", "actualArgument", "action"
- });
+ "script", "actualArgument", "action"
+ });
/* And the arguments: */
Collection args = Model.getFacade().getActualArguments(action);
Iterator i = args.iterator();
Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/java/NotationUtilityJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/java/NotationUtilityJava.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/java/NotationUtilityJava.java (original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/java/NotationUtilityJava.java 2011-07-20 05:10:13-0700
@@ -38,11 +38,9 @@
package org.argouml.notation.providers.java;
-import java.util.Map;
import java.util.Stack;
import org.argouml.model.Model;
-import org.argouml.notation.NotationProvider;
/**
* This class is a utility for the Java notation.
Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/java/OperationNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/java/OperationNotationJava.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/java/OperationNotationJava.java (original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/java/OperationNotationJava.java 2011-07-20 05:10:13-0700
@@ -120,7 +120,7 @@
boolean isReception = Model.getFacade().isAReception(modelElement);
- if (! isReception) {
+ if (!isReception) {
sb.append(generateConcurrency(modelElement));
}
sb.append(generateAbstractness(modelElement));
Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java (original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java 2011-07-20 05:10:13-0700
@@ -95,7 +95,8 @@
}
protected void parseAssociationName(Object modelElement, String text)
- throws ParseException {
+ throws ParseException {
+
boolean derived = false;
text = text.trim();
Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java (original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java 2011-07-20 05:10:13-0700
@@ -97,7 +97,9 @@
String name = Model.getFacade().getName(modelElement);
StringBuffer sb = new StringBuffer("");
if (handleStereotypes) {
- sb.append(NotationUtilityUml.generateStereotype(modelElement, useGuillemets));
+ sb.append(NotationUtilityUml.generateStereotype(
+ modelElement,
+ useGuillemets));
}
if (showVisibility) {
sb.append(generateVisibility(modelElement));
Modified: trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java 2011-07-20 05:10:13-0700
@@ -90,8 +90,8 @@
private List<EdgeData> figEdges = new ArrayList<EdgeData>(50);
- private LinkedHashMap<FigEdge, Object> modelElementsByFigEdge = new LinkedHashMap<FigEdge, Object>(
- 50);
+ private LinkedHashMap<FigEdge, Object> modelElementsByFigEdge =
+ new LinkedHashMap<FigEdge, Object>(50);
private DiagramSettings diagramSettings;
@@ -202,7 +202,8 @@
FigGroup group = (FigGroup) f;
String clsNameBounds = attrList.getValue("description");
if (clsNameBounds != null) {
- StringTokenizer st = new StringTokenizer(clsNameBounds, ",;[] ");
+ StringTokenizer st =
+ new StringTokenizer(clsNameBounds, ",;[] ");
// Discard class name, x y w h
if (st.hasMoreElements()) {
st.nextToken();
@@ -644,8 +645,8 @@
final Rectangle bounds, final Attributes attributes)
throws SAXException {
- final DiagramSettings diagramSettings = ((ArgoDiagram) getDiagram())
- .getDiagramSettings();
+ final DiagramSettings oldSettings =
+ ((ArgoDiagram) getDiagram()).getDiagramSettings();
Fig f = null;
try {
@@ -674,7 +675,7 @@
}
parameters[0] = owner;
parameters[1] = bounds;
- parameters[2] = diagramSettings;
+ parameters[2] = oldSettings;
constructor.setAccessible(true);
f = (Fig) constructor.newInstance(parameters);
@@ -703,10 +704,10 @@
destination = null;
}
- DiagramEdgeSettings settings = new DiagramEdgeSettings(
+ DiagramEdgeSettings newSettings = new DiagramEdgeSettings(
owner, source, destination);
- parameters[0] = settings;
- parameters[1] = diagramSettings;
+ parameters[0] = newSettings;
+ parameters[1] = oldSettings;
constructor.setAccessible(true);
f = (Fig) constructor.newInstance(parameters);
@@ -719,7 +720,7 @@
// FigNodeModelElement when in fact it should not do so.
Object parameters[] = new Object[2];
parameters[0] = bounds;
- parameters[1] = diagramSettings;
+ parameters[1] = oldSettings;
constructor.setAccessible(true);
f = (Fig) constructor.newInstance(parameters);
@@ -746,7 +747,7 @@
// return null;
// }
parameters[0] = owner;
- parameters[1] = diagramSettings;
+ parameters[1] = oldSettings;
constructor.setAccessible(true);
f = (Fig) constructor.newInstance(parameters);
Modified: trunk/src/argouml-app/src/org/argouml/persistence/PgmlUtility.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/PgmlUtility.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/PgmlUtility.java (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/PgmlUtility.java 2011-07-20 05:10:13-0700
@@ -76,7 +76,9 @@
* @return "0"=hidden, null=shown
*/
public static String getVisibility(Fig f) {
- if (f.isVisible()) return null;
+ if (f.isVisible()) {
+ return null;
+ }
return "0";
}
Modified: trunk/src/argouml-app/src/org/argouml/persistence/ToDoItemXMLHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/ToDoItemXMLHelper.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/ToDoItemXMLHelper.java (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/ToDoItemXMLHelper.java 2011-07-20 05:10:13-0700
@@ -62,8 +62,9 @@
*/
public ToDoItemXMLHelper(ToDoItem todoItem)
{
- if (todoItem == null)
+ if (todoItem == null) {
throw new NullPointerException();
+ }
item = todoItem;
}
Modified: trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java 2011-07-20 05:10:13-0700
@@ -46,7 +46,6 @@
import java.io.UnsupportedEncodingException;
import java.net.URL;
-import org.apache.log4j.Logger;
import org.argouml.application.api.Argo;
import org.argouml.cognitive.Designer;
import org.argouml.kernel.Project;
@@ -63,9 +62,6 @@
*/
class TodoListMemberFilePersister extends MemberFilePersister {
- private static final Logger LOG =
- Logger.getLogger(ProjectMemberTodoList.class);
-
private static final String TO_DO_TEE = "/org/argouml/persistence/todo.tee";
Modified: trunk/src/argouml-app/src/org/argouml/persistence/XMLTokenTableBase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/XMLTokenTableBase.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/XMLTokenTableBase.java (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/XMLTokenTableBase.java 2011-07-20 05:10:13-0700
@@ -81,8 +81,9 @@
* @return the token
*/
public final int toToken(String s, boolean push) {
- if (push) openTags[++numOpen] = s;
- else if (s.equals(openTags[numOpen])) {
+ if (push) {
+ openTags[++numOpen] = s;
+ } else if (s.equals(openTags[numOpen])) {
LOG.debug("matched: " + s);
return openTokens[numOpen--];
}
@@ -90,8 +91,9 @@
if (i != null) {
openTokens[numOpen] = i.intValue();
return openTokens[numOpen];
+ } else {
+ return -1;
}
- else return -1;
}
/**
Modified: trunk/src/argouml-app/src/org/argouml/profile/UserDefinedProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/UserDefinedProfile.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/UserDefinedProfile.java (original)
+++ trunk/src/argouml-app/src/org/argouml/profile/UserDefinedProfile.java 2011-07-20 05:10:13-0700
@@ -142,7 +142,8 @@
* @throws ProfileException if the profile could not be loaded
*/
public UserDefinedProfile(File file, ProfileManager manager)
- throws ProfileException {
+ throws ProfileException {
+
LOG.info("load " + file);
displayName = file.getName();
modelFile = file;
@@ -230,7 +231,8 @@
* @throws ProfileException if the profile can't be read or is not valid
*/
public UserDefinedProfile(URL url, ProfileManager manager)
- throws ProfileException {
+ throws ProfileException {
+
LOG.info("load " + url);
reference = new UserProfileReference(url.getPath(), url);
profileManager = manager;
@@ -265,7 +267,8 @@
*/
public UserDefinedProfile(String dn, URL url, Set<Critic> critics,
Set<String> dependencies, ProfileManager manager)
- throws ProfileException {
+ throws ProfileException {
+
LOG.info("load " + url);
this.displayName = dn;
@@ -276,7 +279,7 @@
for (String profileID : dependencies) {
addProfileDependency(profileID);
}
- profileManager = manager;
+ profileManager = manager;
}
/**
@@ -289,7 +292,8 @@
* @throws ProfileException if the model cannot be loaded
*
* @deprecated for 0.30 by euluis. Use
- * {@link UserDefinedProfile#UserDefinedProfile(String, URL, Set, Set, ProfileManager)}
+ * {@link UserDefinedProfile#UserDefinedProfile(
+ * String, URL, Set, Set, ProfileManager)}
* instead.
*/
@Deprecated
@@ -332,8 +336,9 @@
Collection packagesInProfile = filterPackages(profilePackages);
for (Object obj : packagesInProfile) {
- // if there is only one package in the model, we should suppose it's
- // the profile model, if there is more than one, we take the ones
+ // if there is only one package in the model,
+ // we should suppose it's the profile model,
+ // if there is more than one, we take the ones
// marked as <<profile>>
if (Model.getFacade().isAModelElement(obj)
&& (Model.getFacade().isAProfile(obj)
@@ -454,9 +459,10 @@
private Collection filterPackages(Collection packages) {
Collection ret = new ArrayList();
- // TODO: All this profile loading/handling needs to move someplace in model subsystem probably
+ // TODO: All this profile loading/handling needs to
+ // move someplace in model subsystem probably
- for (Object object: packages) {
+ for (Object object : packages) {
if (Model.getFacade().isAPackage(object)) {
ret.add(object);
}
@@ -655,7 +661,8 @@
private List<CrOCL> getAllCritiquesInModel() {
List<CrOCL> ret = new ArrayList<CrOCL>();
- Collection<Object> comments = getAllCommentsInModel(getProfilePackages());
+ Collection<Object> comments =
+ getAllCommentsInModel(getProfilePackages());
for (Object comment : comments) {
if (Model.getExtensionMechanismsHelper().hasStereotype(comment,
Modified: trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileMeta.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileMeta.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileMeta.java (original)
+++ trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileMeta.java 2011-07-20 05:10:13-0700
@@ -81,7 +81,6 @@
*
* @throws ProfileException if something goes wrong
*/
- @SuppressWarnings("unchecked")
public ProfileMeta() throws ProfileException {
super();
try {
Modified: trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/OclAPIModelInterpreter.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/OclAPIModelInterpreter.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/OclAPIModelInterpreter.java (original)
+++ trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/OclAPIModelInterpreter.java 2011-07-20 05:10:13-0700
@@ -40,7 +40,6 @@
import java.util.Map;
-import org.apache.log4j.Logger;
import org.argouml.model.Model;
import org.argouml.profile.internal.ocl.ModelInterpreter;
@@ -51,9 +50,6 @@
*/
public class OclAPIModelInterpreter implements ModelInterpreter {
- private static final Logger LOG = Logger
- .getLogger(OclAPIModelInterpreter.class);
-
/*
* @see org.argouml.profile.internal.ocl.ModelInterpreter#invokeFeature(java.util.Map,
* java.lang.Object, java.lang.String, java.lang.String,
Modified: trunk/src/argouml-app/src/org/argouml/swingext/JLinkButton.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/swingext/JLinkButton.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/swingext/JLinkButton.java (original)
+++ trunk/src/argouml-app/src/org/argouml/swingext/JLinkButton.java 2011-07-20 05:10:13-0700
@@ -127,7 +127,9 @@
linkColor = Color.blue;
colorPressed = Color.red;
visitedLinkColor = new Color(128, 0, 128);
- if (text == null && url != null) setText(url.toExternalForm());
+ if (text == null && url != null) {
+ setText(url.toExternalForm());
+ }
setLinkURL(url);
setCursor(Cursor.getPredefinedCursor(12));
setBorderPainted(false);
@@ -148,7 +150,9 @@
protected void setupToolTipText() {
String tip = null;
- if (buttonURL != null) tip = buttonURL.toExternalForm();
+ if (buttonURL != null) {
+ tip = buttonURL.toExternalForm();
+ }
setToolTipText(tip);
}
@@ -191,14 +195,15 @@
protected String paramString() {
String str;
- if (linkBehavior == ALWAYS_UNDERLINE)
+ if (linkBehavior == ALWAYS_UNDERLINE) {
str = "ALWAYS_UNDERLINE";
- else if (linkBehavior == HOVER_UNDERLINE)
+ } else if (linkBehavior == HOVER_UNDERLINE) {
str = "HOVER_UNDERLINE";
- else if (linkBehavior == NEVER_UNDERLINE)
+ } else if (linkBehavior == NEVER_UNDERLINE) {
str = "NEVER_UNDERLINE";
- else
+ } else {
str = "SYSTEM_DEFAULT";
+ }
String colorStr = linkColor == null ? "" : linkColor.toString();
String colorPressStr = colorPressed == null ? "" : colorPressed
.toString();
@@ -232,25 +237,32 @@
ButtonModel bnModel = bn.getModel();
bn.getForeground();
if (bnModel.isEnabled()) {
- if (bnModel.isPressed())
+ if (bnModel.isPressed()) {
bn.setForeground(bn.getActiveLinkColor());
- else if (bn.isLinkVisited())
+ } else if (bn.isLinkVisited()) {
bn.setForeground(bn.getVisitedLinkColor());
-
- else
+ } else {
bn.setForeground(bn.getLinkColor());
+ }
} else {
- if (bn.getDisabledLinkColor() != null)
+ if (bn.getDisabledLinkColor() != null) {
bn.setForeground(bn.getDisabledLinkColor());
+ }
}
super.paintText(g, com, rect, s);
int behaviour = bn.getLinkBehavior();
boolean drawLine = false;
if (behaviour == JLinkButton.HOVER_UNDERLINE) {
- if (bnModel.isRollover()) drawLine = true;
+ if (bnModel.isRollover()) {
+ drawLine = true;
+ }
} else if (behaviour == JLinkButton.ALWAYS_UNDERLINE
- || behaviour == JLinkButton.SYSTEM_DEFAULT) drawLine = true;
- if (!drawLine) return;
+ || behaviour == JLinkButton.SYSTEM_DEFAULT) {
+ drawLine = true;
+ }
+ if (!drawLine) {
+ return;
+ }
FontMetrics fm = g.getFontMetrics();
int x = rect.x + getTextShiftOffset();
int y = (rect.y + fm.getAscent() + fm.getDescent()
Modified: trunk/src/argouml-app/src/org/argouml/ui/AboutBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/AboutBox.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/AboutBox.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/AboutBox.java 2011-07-20 05:10:13-0700
@@ -56,7 +56,6 @@
import org.argouml.i18n.Translator;
import org.argouml.moduleloader.ModuleLoader2;
-import org.argouml.profile.ProfileFacade;
import org.argouml.util.ArgoDialog;
import org.argouml.util.Tools;
Modified: trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java 2011-07-20 05:10:13-0700
@@ -44,7 +44,6 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
-import org.argouml.uml.diagram.ui.FigCompartment;
import org.argouml.uml.ui.AbstractActionNewModelElement;
/**
@@ -56,14 +55,14 @@
public class ActionCreateContainedModelElement
extends AbstractActionNewModelElement {
- final private Object metaType;
- final private String property;
+ private final Object metaType;
+ private final String property;
/**
* Construct the action.
*
* @param theMetaType the element to be created
- * @param target the container that will own the new element
+ * @param container the container that will own the new element
*/
public ActionCreateContainedModelElement(
Object theMetaType,
Modified: trunk/src/argouml-app/src/org/argouml/ui/ContextActionFactoryManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ContextActionFactoryManager.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ContextActionFactoryManager.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ContextActionFactoryManager.java 2011-07-20 05:10:13-0700
@@ -44,7 +44,6 @@
import javax.swing.Action;
-import org.apache.log4j.Logger;
import org.argouml.kernel.ActionList;
import org.argouml.ui.targetmanager.TargetManager;
@@ -94,8 +93,9 @@
}
/**
- * Adds to the default actions the new menus for the registered factories
- * @return
+ * Adds to the default actions the new menus for the registered factories.
+ *
+ * @return all actions found.
*/
public static List<Action> getContextPopupActions() {
List<Action> allActionsFound = new ArrayList<Action>();
@@ -108,7 +108,8 @@
if (tmpActionsContainer instanceof ActionList) {
allActionsFound.add((Action) tmpActionsContainer);
} else {
- if (tmpActionsContainer != null && tmpActionsContainer.size() > 0) {
+ if (tmpActionsContainer != null
+ && tmpActionsContainer.size() > 0) {
allActionsFound.addAll(tmpActionsContainer);
}
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/DetailsPane.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/DetailsPane.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/DetailsPane.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/DetailsPane.java 2011-07-20 05:10:13-0700
@@ -157,7 +157,7 @@
orientation = theOrientation;
- loadTabs(compassPoint, theOrientation);
+ loadTabs(compassPoint);
setOrientation(orientation);
@@ -174,7 +174,7 @@
* details panels, but we currently only support
* the default South (bottom) panel
*/
- private void loadTabs(String direction, Orientation theOrientation) {
+ private void loadTabs(String direction) {
if (Position.South.toString().equalsIgnoreCase(direction)
// Special case for backward compatibility
|| "detail".equalsIgnoreCase(direction)) {
@@ -488,10 +488,11 @@
Object target = TargetManager.getInstance().getSingleTarget();
if (!(sel instanceof TabToDoTarget) && !(sel instanceof TabProps)) {
- // TODO: Bob says - tabs that listen for target changes should register themselves
- // not expect DetailsPane to listen and pass on the event. Otherwise these tabs
- // always rely on DetailsPane. TabToDoTarget and TabProps currently
- // listen directly.
+ // TODO: Bob says - tabs that listen for target changes
+ // should register themselves not expect DetailsPane to
+ // listen and pass on the event. Otherwise these tabs
+ // always rely on DetailsPane. TabToDoTarget and TabProps
+ // currently listen directly.
// The other tabs need to be updated depending on the selection.
if (sel instanceof TabTarget) {
@@ -504,7 +505,9 @@
// a new set target event for it to refresh it
((TargetListener) sel).targetSet(new TargetEvent(this,
TargetEvent.TARGET_SET, new Object[] {},
- new Object[] { target }));
+ new Object[] {
+ target
+ }));
}
}
@@ -657,20 +660,22 @@
JPanel tab = tabPanelList.get(i);
boolean shouldEnable = false;
if (!(tab instanceof TabToDoTarget) && !(tab instanceof TabProps)) {
- // TODO: Bob says - tabs that listen for target changes should register themselves
- // not expect DetailsPane to listen and pass on the event. Otherwise these tabs
- // always rely on DetailsPane. TabToDoTarget and TabProps currently
- // listen directly.
+ // TODO: Bob says - tabs that listen for target changes
+ // should register themselves not expect DetailsPane to
+ // listen and pass on the event. Otherwise these tabs
+ // always rely on DetailsPane. TabToDoTarget and TabProps
+ // currently listen directly.
if (tab instanceof TargetListener) {
if (tab instanceof TabTarget) {
- shouldEnable = ((TabTarget) tab).shouldBeEnabled(target);
+ shouldEnable =
+ ((TabTarget) tab).shouldBeEnabled(target);
} else {
if (tab instanceof TabToDoTarget) {
shouldEnable = true;
}
}
- // TODO: Do we want all enabled tabs to listen or only the one
- // that is selected/visible? - tfm
+ // TODO: Do we want all enabled tabs to listen or
+ // only the one that is selected/visible? - tfm
removeTargetListener((TargetListener) tab);
if (shouldEnable) {
addTargetListener((TargetListener) tab);
Modified: trunk/src/argouml-app/src/org/argouml/ui/HelpBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/HelpBox.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/HelpBox.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/HelpBox.java 2011-07-20 05:10:13-0700
@@ -77,18 +77,18 @@
* The names and URLs for the pages.
*/
private String pages[][] = {
- {
- Translator.localize("tab.help.manual"),
- (Translator.localize("tab.help.path.manual")
- + "manual-" + ApplicationVersion.getStableVersion()
- + "/"),
- Translator.localize("tab.help.tip.manual")
- },
- {
- Translator.localize("tab.help.support"),
- Translator.localize("tab.help.path.support"),
- Translator.localize("tab.help.tip.support")
- }
+ {
+ Translator.localize("tab.help.manual"),
+ (Translator.localize("tab.help.path.manual")
+ + "manual-" + ApplicationVersion.getStableVersion()
+ + "/"),
+ Translator.localize("tab.help.tip.manual")
+ },
+ {
+ Translator.localize("tab.help.support"),
+ Translator.localize("tab.help.path.support"),
+ Translator.localize("tab.help.tip.support")
+ }
};
Modified: trunk/src/argouml-app/src/org/argouml/ui/LoadSwingWorker.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/LoadSwingWorker.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/LoadSwingWorker.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/LoadSwingWorker.java 2011-07-20 05:10:13-0700
@@ -53,8 +53,8 @@
* in scope to package to package only. It is currently only used by
* ProjectBrowser and any client calling should use methods there for load.
*/
-class LoadSwingWorker extends SwingWorker {
@Deprecated
+class LoadSwingWorker extends SwingWorker {
private static final Logger LOG = Logger.getLogger(LoadSwingWorker.class);
Modified: trunk/src/argouml-app/src/org/argouml/ui/MultiEditorPane.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/MultiEditorPane.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/MultiEditorPane.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/MultiEditorPane.java 2011-07-20 05:10:13-0700
@@ -300,8 +300,9 @@
int tab = tabs.getSelectedIndex();
if (tab != -1) {
Rectangle tabBounds = tabs.getBoundsAt(tab);
- if (!tabBounds.contains(me.getX(), me.getY()))
+ if (!tabBounds.contains(me.getX(), me.getY())) {
return;
+ }
if (me.getClickCount() == 1) {
mySingleClick(tab);
me.consume();
Modified: trunk/src/argouml-app/src/org/argouml/ui/SaveSwingWorker.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/SaveSwingWorker.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/SaveSwingWorker.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/SaveSwingWorker.java 2011-07-20 05:10:13-0700
@@ -55,8 +55,8 @@
* in visibility to package visibility only. It is currently only used by
* ProjectBrowser and any client calling should use methods there for save.
*/
-class SaveSwingWorker extends SwingWorker {
@Deprecated
+class SaveSwingWorker extends SwingWorker {
private final boolean overwrite;
private final File file;
Modified: trunk/src/argouml-app/src/org/argouml/ui/SplashScreen.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/SplashScreen.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/SplashScreen.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/SplashScreen.java 2011-07-20 05:10:13-0700
@@ -56,7 +56,9 @@
/**
* The splash screen.
*/
-public class SplashScreen extends JWindow implements IStatusBar, ProgressMonitor {
+public class SplashScreen
+ extends JWindow
+ implements IStatusBar, ProgressMonitor {
private StatusBar statusBar = new StatusBar();
@@ -182,7 +184,10 @@
// ignored - will never be called
}
- public void notifyMessage(String title, String introduction, String message) {
+ public void notifyMessage(
+ String title,
+ String introduction,
+ String message) {
// TODO: Auto-generated method stub
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/StatusBar.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/StatusBar.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/StatusBar.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/StatusBar.java 2011-07-20 05:10:13-0700
@@ -56,8 +56,8 @@
*
*/
public class StatusBar
-extends JPanel
-implements Runnable, IStatusBar, ProgressMonitor {
+ extends JPanel
+ implements Runnable, IStatusBar, ProgressMonitor {
private JLabel msg = new JLabel();
private JProgressBar progress = new JProgressBar();
@@ -164,9 +164,12 @@
progress.setMaximum(max);
}
- public void notifyNullAction() {}
+ public void notifyNullAction() { }
- public void notifyMessage(String title, String introduction, String message) {
+ public void notifyMessage(
+ String title,
+ String introduction,
+ String message) {
// TODO: Auto-generated method stub
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigRRect.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigRRect.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigRRect.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/StylePanelFigRRect.java 2011-07-20 05:10:13-0700
@@ -96,9 +96,13 @@
* Set the corner rounding.
*/
protected void setTargetRounding() {
- if (getPanelTarget() == null) return;
+ if (getPanelTarget() == null) {
+ return;
+ }
String roundingStr = roundingField.getText();
- if (roundingStr.length() == 0) return;
+ if (roundingStr.length() == 0) {
+ return;
+ }
int r = Integer.parseInt(roundingStr);
((FigRRect) getPanelTarget()).setCornerRadius(r);
getPanelTarget().endTrans();
@@ -111,7 +115,9 @@
*/
public void insertUpdate(DocumentEvent e) {
Document roundingDoc = roundingField.getDocument();
- if (e.getDocument() == roundingDoc) setTargetRounding();
+ if (e.getDocument() == roundingDoc) {
+ setTargetRounding();
+ }
super.insertUpdate(e);
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/SystemInfoDialog.java 2011-07-20 05:10:13-0700
@@ -42,7 +42,6 @@
package org.argouml.ui;
-import java.awt.Frame;
import java.awt.Insets;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.ClipboardOwner;
Modified: trunk/src/argouml-app/src/org/argouml/ui/UndoableAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/UndoableAction.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/UndoableAction.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/UndoableAction.java 2011-07-20 05:10:13-0700
@@ -76,6 +76,7 @@
public void actionPerformed(ActionEvent e) {
final Project p = ProjectManager.getManager().getCurrentProject();
- p.getUndoManager().startInteraction((String) getValue(AbstractAction.NAME));
+ p.getUndoManager().startInteraction(
+ (String) getValue(AbstractAction.NAME));
}
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionHelp.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionHelp.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionHelp.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionHelp.java 2011-07-20 05:10:13-0700
@@ -41,12 +41,10 @@
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
-import javax.swing.JFrame;
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
import org.argouml.ui.HelpBox;
-// import org.argouml.util.ArgoFrame;
/**
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerTreeNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerTreeNode.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerTreeNode.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerTreeNode.java 2011-07-20 05:10:13-0700
@@ -74,8 +74,9 @@
public ExplorerTreeNode(Object userObj, ExplorerTreeModel m) {
super(userObj);
this.model = m;
- if (userObj instanceof Diagram)
+ if (userObj instanceof Diagram) {
((Diagram) userObj).addPropertyChangeListener(this);
+ }
}
/*
@@ -102,10 +103,11 @@
* @param set the given set
*/
public void setModifySet(Set set) {
- if (set == null || set.size() == 0)
+ if (set == null || set.size() == 0) {
modifySet = Collections.EMPTY_SET;
- else
+ } else {
modifySet = set;
+ }
}
/**
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/TypeThenNameOrder.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/TypeThenNameOrder.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/TypeThenNameOrder.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/TypeThenNameOrder.java 2011-07-20 05:10:13-0700
@@ -79,8 +79,9 @@
}
if (obj1 == null) {
- if (obj2 == null)
- return 0;
+ if (obj2 == null) {
+ return 0;
+ }
return -1;
} else if (obj2 == null) {
return 1;
@@ -95,24 +96,29 @@
// return compareUserObjects(obj1, obj2);
int typeNameOrder = typeName.compareTo(typeName1);
- if (typeNameOrder == 0)
+ if (typeNameOrder == 0) {
return compareUserObjects(obj1, obj2);
+ }
if (typeName.indexOf("Diagram") == -1
- && typeName1.indexOf("Diagram") != -1)
+ && typeName1.indexOf("Diagram") != -1) {
return 1;
+ }
if (typeName.indexOf("Diagram") != -1
- && typeName1.indexOf("Diagram") == -1)
+ && typeName1.indexOf("Diagram") == -1) {
return -1;
+ }
if (typeName.indexOf("Package") == -1
- && typeName1.indexOf("Package") != -1)
+ && typeName1.indexOf("Package") != -1) {
return 1;
+ }
if (typeName.indexOf("Package") != -1
- && typeName1.indexOf("Package") == -1)
+ && typeName1.indexOf("Package") == -1) {
return -1;
+ }
return typeNameOrder;
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoClassToSummary.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoClassToSummary.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoClassToSummary.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoClassToSummary.java 2011-07-20 05:10:13-0700
@@ -70,14 +70,17 @@
if (Model.getFacade().isAClass(parent)) {
ArrayList list = new ArrayList();
- if (Model.getFacade().getAttributes(parent).size() > 0)
- list.add(new AttributesNode(parent));
+ if (Model.getFacade().getAttributes(parent).size() > 0) {
+ list.add(new AttributesNode(parent));
+ }
- if (Model.getFacade().getAssociationEnds(parent).size() > 0)
- list.add(new AssociationsNode(parent));
+ if (Model.getFacade().getAssociationEnds(parent).size() > 0) {
+ list.add(new AssociationsNode(parent));
+ }
- if (Model.getFacade().getOperations(parent).size() > 0)
- list.add(new OperationsNode(parent));
+ if (Model.getFacade().getOperations(parent).size() > 0) {
+ list.add(new OperationsNode(parent));
+ }
if (hasIncomingDependencies(parent)) {
list.add(new IncomingDependencyNode(parent));
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java 2011-07-20 05:10:13-0700
@@ -46,7 +46,6 @@
import org.argouml.cognitive.CompoundCritic;
import org.argouml.cognitive.Critic;
import org.argouml.i18n.Translator;
-import org.argouml.profile.Profile;
/**
* Show the critics exported by a Profile
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoModelElementToTemplateParameter.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoModelElementToTemplateParameter.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoModelElementToTemplateParameter.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoModelElementToTemplateParameter.java 2011-07-20 05:10:13-0700
@@ -2,7 +2,6 @@
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Set;
import org.argouml.i18n.Translator;
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoModelToDiagrams.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoModelToDiagrams.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoModelToDiagrams.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoModelToDiagrams.java 2011-07-20 05:10:13-0700
@@ -74,7 +74,7 @@
Project proj = ProjectManager.getManager().getCurrentProject();
for (ArgoDiagram diagram : proj.getDiagramList()) {
if (isInPath(diagram.getNamespace(), model)) {
- returnList.add(diagram);
+ returnList.add(diagram);
}
}
return returnList;
Modified: trunk/src/argouml-app/src/org/argouml/uml/DocumentationManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/DocumentationManager.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/DocumentationManager.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/DocumentationManager.java 2011-07-20 05:10:13-0700
@@ -101,8 +101,9 @@
}
}
- if (sResult == null)
+ if (sResult == null) {
return "(No comment)";
+ }
StringBuffer result = new StringBuffer();
if (header != null) {
@@ -285,8 +286,9 @@
int nlcount = 0;
for (; nlprefix > 0; nlprefix--) {
- if (prefix != null)
- sb.append(prefix);
+ if (prefix != null) {
+ sb.append(prefix);
+ }
sb.append(LINE_SEPARATOR);
nlcount++;
}
@@ -302,14 +304,16 @@
while (tokens.hasMoreTokens()) {
String s = tokens.nextToken();
if (!s.startsWith("\r") && !s.startsWith("\n")) {
- if (prefix != null)
+ if (prefix != null) {
sb.append(prefix);
+ }
sb.append(s);
sb.append(LINE_SEPARATOR);
nlcount = 0;
} else if (nlcount > 0) {
- if (prefix != null)
+ if (prefix != null) {
sb.append(prefix);
+ }
sb.append(LINE_SEPARATOR);
nlcount++;
} else {
Modified: trunk/src/argouml-app/src/org/argouml/uml/ProjectMemberModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ProjectMemberModel.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ProjectMemberModel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ProjectMemberModel.java 2011-07-20 05:10:13-0700
@@ -65,8 +65,9 @@
+ FILE_EXT, p);
if (!Model.getFacade().isAModel(m)
- && !Model.getFacade().isAProfile(m))
+ && !Model.getFacade().isAProfile(m)) {
throw new IllegalArgumentException();
+ }
setModel(m);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/UUIDHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/UUIDHelper.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/UUIDHelper.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/UUIDHelper.java 2011-07-20 05:10:13-0700
@@ -62,7 +62,9 @@
if (base instanceof Fig) {
base = ((Fig) base).getOwner();
}
- if (base == null) return null;
+ if (base == null) {
+ return null;
+ }
if (base instanceof CommentEdge) {
return (String) ((CommentEdge) base).getUUID();
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClClassName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClClassName.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClClassName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClClassName.java 2011-07-20 05:10:13-0700
@@ -95,18 +95,26 @@
while (true) {
g.drawLine(i, height, i + WAVE_LENGTH, height + WAVE_HEIGHT);
i += WAVE_LENGTH;
- if (i >= right) break;
+ if (i >= right) {
+ break;
+ }
g.drawLine(i, height + WAVE_HEIGHT, i + WAVE_LENGTH, height);
i += WAVE_LENGTH;
- if (i >= right) break;
+ if (i >= right) {
+ break;
+ }
g.drawLine(i, height, i + WAVE_LENGTH,
height + WAVE_HEIGHT / 2);
i += WAVE_LENGTH;
- if (i >= right) break;
+ if (i >= right) {
+ break;
+ }
g.drawLine(i, height + WAVE_HEIGHT / 2, i + WAVE_LENGTH,
height);
i += WAVE_LENGTH;
- if (i >= right) break;
+ if (i >= right) {
+ break;
+ }
}
fig = null;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClOperationCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClOperationCompartment.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClOperationCompartment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClOperationCompartment.java 2011-07-20 05:10:13-0700
@@ -91,7 +91,9 @@
if (fig instanceof FigCompartmentBox) {
final FigCompartment fc = ((FigCompartmentBox)
fig).getCompartment(Model.getMetaTypes().getOperation());
- if (fc == null) return;
+ if (fc == null) {
+ return;
+ }
// added by Eric Lefevre 13 Mar 1999: we must check if the
// FigText for operations is drawn before drawing things
@@ -110,18 +112,26 @@
while (true) {
g.drawLine(i, height, i + WAVE_LENGTH, height + WAVE_HEIGHT);
i += WAVE_LENGTH;
- if (i >= right) break;
+ if (i >= right) {
+ break;
+ }
g.drawLine(i, height + WAVE_HEIGHT, i + WAVE_LENGTH, height);
i += WAVE_LENGTH;
- if (i >= right) break;
+ if (i >= right) {
+ break;
+ }
g.drawLine(i, height, i + WAVE_LENGTH,
height + WAVE_HEIGHT / 2);
i += WAVE_LENGTH;
- if (i >= right) break;
+ if (i >= right) {
+ break;
+ }
g.drawLine(i, height + WAVE_HEIGHT / 2, i + WAVE_LENGTH,
height);
i += WAVE_LENGTH;
- if (i >= right) break;
+ if (i >= right) {
+ break;
+ }
}
fig = null;
}
@@ -141,10 +151,14 @@
* @see org.argouml.ui.Clarifier#hit(int, int)
*/
public boolean hit(int x, int y) {
- if (!(fig instanceof FigCompartmentBox)) return false;
+ if (!(fig instanceof FigCompartmentBox)) {
+ return false;
+ }
FigCompartment compartment = ((FigCompartmentBox) fig)
.getCompartment(Model.getMetaTypes().getOperation());
- if (compartment == null) return false;
+ if (compartment == null) {
+ return false;
+ }
Rectangle fr = compartment.getBounds();
boolean res = fr.contains(x, y);
fig = null;
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java 2011-07-20 05:10:13-0700
@@ -120,10 +120,14 @@
*/
@Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
- if (!isActive()) return false;
+ if (!isActive()) {
+ return false;
+ }
ListSet offs = i.getOffenders();
Object dm = offs.get(0);
- if (!predicate(dm, dsgr)) return false;
+ if (!predicate(dm, dsgr)) {
+ return false;
+ }
ListSet newOffs = computeOffenders(dm);
boolean res = offs.equals(newOffs);
LOG.debug("offs=" + offs.toString()
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassWithoutComponent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassWithoutComponent.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassWithoutComponent.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassWithoutComponent.java 2011-07-20 05:10:13-0700
@@ -72,10 +72,14 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
+ if (!(dm instanceof UMLDeploymentDiagram)) {
+ return NO_PROBLEM;
+ }
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
- if (offs == null) return NO_PROBLEM;
+ if (offs == null) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -96,7 +100,9 @@
*/
@Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
- if (!isActive()) return false;
+ if (!isActive()) {
+ return false;
+ }
ListSet offs = i.getOffenders();
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) offs.get(0);
//if (!predicate(dm, dsgr)) return false;
@@ -120,7 +126,9 @@
Iterator figIter = figs.iterator();
while (figIter.hasNext()) {
Object obj = figIter.next();
- if (!(obj instanceof FigClass)) continue;
+ if (!(obj instanceof FigClass)) {
+ continue;
+ }
FigClass fc = (FigClass) obj;
if (fc.getEnclosingFig() == null
|| (!(Model.getFacade().isAComponent(fc.getEnclosingFig()
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java 2011-07-20 05:10:13-0700
@@ -73,10 +73,14 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
+ if (!(dm instanceof UMLDeploymentDiagram)) {
+ return NO_PROBLEM;
+ }
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
- if (offs == null) return NO_PROBLEM;
+ if (offs == null) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -97,7 +101,9 @@
*/
@Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
- if (!isActive()) return false;
+ if (!isActive()) {
+ return false;
+ }
ListSet offs = i.getOffenders();
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) offs.get(0);
//if (!predicate(dm, dsgr)) return false;
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentWithoutNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentWithoutNode.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentWithoutNode.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentWithoutNode.java 2011-07-20 05:10:13-0700
@@ -73,10 +73,14 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
+ if (!(dm instanceof UMLDeploymentDiagram)) {
+ return NO_PROBLEM;
+ }
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
- if (offs == null) return NO_PROBLEM;
+ if (offs == null) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -97,7 +101,9 @@
*/
@Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
- if (!isActive()) return false;
+ if (!isActive()) {
+ return false;
+ }
ListSet offs = i.getOffenders();
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) offs.get(0);
//if (!predicate(dm, dsgr)) return false;
@@ -124,12 +130,16 @@
boolean isNode = false;
while (figIter.hasNext()) {
Object obj = figIter.next();
- if (obj instanceof FigMNode) isNode = true;
+ if (obj instanceof FigMNode) {
+ isNode = true;
+ }
}
figIter = figs.iterator();
while (figIter.hasNext()) {
Object obj = figIter.next();
- if (!(obj instanceof FigComponent)) continue;
+ if (!(obj instanceof FigComponent)) {
+ continue;
+ }
FigComponent fc = (FigComponent) obj;
if ((fc.getEnclosingFig() == null) && isNode) {
if (offs == null) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrConstructorNeeded.java 2011-07-20 05:10:13-0700
@@ -108,8 +108,9 @@
// We don't consider secondary stuff.
- if (!(Model.getFacade().isPrimaryObject(dm)))
+ if (!(Model.getFacade().isPrimaryObject(dm))) {
return NO_PROBLEM;
+ }
// Types don't need a constructor.
if (Model.getFacade().isType(dm)) {
@@ -139,11 +140,13 @@
while (attrs.hasNext()) {
Object attr = attrs.next();
- if (Model.getFacade().isStatic(attr))
+ if (Model.getFacade().isStatic(attr)) {
continue;
+ }
- if (Model.getFacade().isInitialized(attr))
+ if (Model.getFacade().isInitialized(attr)) {
continue;
+ }
// We have found a non-static one that is not initialized.
return PROBLEM_FOUND;
@@ -165,8 +168,9 @@
Object me = item.getOffenders().get(0);
String ins = super.getInstructions();
String sug = null;
- if (me != null)
- sug = Model.getFacade().getName(me);
+ if (me != null) {
+ sug = Model.getFacade().getName(me);
+ }
if ("".equals(sug)) {
sug = super.getDefaultSuggestion();
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInstanceWithoutClassifier.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInstanceWithoutClassifier.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInstanceWithoutClassifier.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInstanceWithoutClassifier.java 2011-07-20 05:10:13-0700
@@ -72,10 +72,14 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
+ if (!(dm instanceof UMLDeploymentDiagram)) {
+ return NO_PROBLEM;
+ }
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
- if (offs == null) return NO_PROBLEM;
+ if (offs == null) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -96,7 +100,9 @@
*/
@Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
- if (!isActive()) return false;
+ if (!isActive()) {
+ return false;
+ }
ListSet offs = i.getOffenders();
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) offs.get(0);
//if (!predicate(dm, dsgr)) return false;
@@ -120,7 +126,9 @@
Iterator figIter = figs.iterator();
while (figIter.hasNext()) {
Object obj = figIter.next();
- if (!(obj instanceof FigNodeModelElement)) continue;
+ if (!(obj instanceof FigNodeModelElement)) {
+ continue;
+ }
FigNodeModelElement figNodeModelElement = (FigNodeModelElement) obj;
if (figNodeModelElement != null
&& (Model.getFacade().isAInstance(
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java 2011-07-20 05:10:13-0700
@@ -75,13 +75,18 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isAInterface(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAInterface(dm))) {
+ return NO_PROBLEM;
+ }
Object inf = dm;
Collection sf = Model.getFacade().getFeatures(inf);
- if (sf == null) return NO_PROBLEM;
+ if (sf == null) {
+ return NO_PROBLEM;
+ }
for (Iterator iter = sf.iterator(); iter.hasNext();) {
- if (Model.getFacade().isAStructuralFeature(iter.next()))
+ if (Model.getFacade().isAStructuralFeature(iter.next())) {
return PROBLEM_FOUND;
+ }
}
return NO_PROBLEM;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceWithoutComponent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceWithoutComponent.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceWithoutComponent.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceWithoutComponent.java 2011-07-20 05:10:13-0700
@@ -127,7 +127,9 @@
Iterator figIter = figs.iterator();
while (figIter.hasNext()) {
Object obj = figIter.next();
- if (!(obj instanceof FigInterface)) continue;
+ if (!(obj instanceof FigInterface)) {
+ continue;
+ }
FigInterface fi = (FigInterface) obj;
Fig enclosing = fi.getEnclosingFig();
if (enclosing == null || (!(Model.getFacade()
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java 2011-07-20 05:10:13-0700
@@ -108,9 +108,10 @@
if (Model.getFacade().isAAttribute(me)) {
Object a = me;
int count = 1;
- if (Model.getFacade().getOwner(a) != null)
+ if (Model.getFacade().getOwner(a) != null) {
count = Model.getFacade().getFeatures(
Model.getFacade().getOwner(a)).size();
+ }
sug = "attr" + (count + 1);
}
((WizMEName) w).setInstructions(ins);
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java 2011-07-20 05:10:13-0700
@@ -97,9 +97,10 @@
if (Model.getFacade().isAOperation(me)) {
Object a = me;
int count = 1;
- if (Model.getFacade().getOwner(a) != null)
+ if (Model.getFacade().getOwner(a) != null) {
count = Model.getFacade().getFeatures(
Model.getFacade().getOwner(a)).size();
+ }
sug = "oper" + (count + 1);
}
((WizMEName) w).setInstructions(ins);
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflict.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflict.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflict.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflict.java 2011-07-20 05:10:13-0700
@@ -104,16 +104,20 @@
if (Model.getFacade().isANamespace(dm)) {
HashMap<String, Object> names = new HashMap<String, Object>();
for (Object name1Object : Model.getFacade().getOwnedElements(dm)) {
- if (!Model.getFacade().isANamedElement(name1Object))
+ if (!Model.getFacade().isANamedElement(name1Object)) {
continue;
- // TODO: Do we need this Generalization is not a named element
- if (Model.getFacade().isAGeneralization(name1Object))
+ }
+ // TODO: Do we need this Generalization is not a named element
+ if (Model.getFacade().isAGeneralization(name1Object)) {
continue;
+ }
String name = Model.getFacade().getName(name1Object);
- if (name == null)
+ if (name == null) {
continue;
- if ("".equals(name))
+ }
+ if ("".equals(name)) {
continue;
+ }
if (names.containsKey(name)) {
Object offender = names.get(name);
if (!offenderResult.contains(offender)) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java 2011-07-20 05:10:13-0700
@@ -103,17 +103,21 @@
// not having any.
// utility is a namespace collection - also not strictly required
// to have associations.
- if (Model.getFacade().isType(dm))
+ if (Model.getFacade().isType(dm)) {
return NO_PROBLEM;
- if (Model.getFacade().isUtility(dm))
+ }
+ if (Model.getFacade().isUtility(dm)) {
return NO_PROBLEM;
+ }
// See issue 1129: If the classifier has dependencies,
// then mostly there is no problem.
- if (Model.getFacade().getClientDependencies(dm).size() > 0)
+ if (Model.getFacade().getClientDependencies(dm).size() > 0) {
return NO_PROBLEM;
- if (Model.getFacade().getSupplierDependencies(dm).size() > 0)
+ }
+ if (Model.getFacade().getSupplierDependencies(dm).size() > 0) {
return NO_PROBLEM;
+ }
// special cases for use cases
// Extending use cases and use case that are being included are
@@ -135,8 +139,9 @@
//TODO: different critic or special message for classes
//that inherit all ops but define none of their own.
- if (findAssociation(dm, 0))
+ if (findAssociation(dm, 0)) {
return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -147,23 +152,28 @@
* or in any of its generalizations.
*/
private boolean findAssociation(Object dm, int depth) {
- if (Model.getFacade().getAssociationEnds(dm).iterator().hasNext())
+ if (Model.getFacade().getAssociationEnds(dm).iterator().hasNext()) {
return true;
+ }
- if (depth > 50)
+ if (depth > 50) {
return false;
+ }
Iterator iter = Model.getFacade().getGeneralizations(dm).iterator();
while (iter.hasNext()) {
Object parent = Model.getFacade().getGeneral(iter.next());
- if (parent == dm)
+ if (parent == dm) {
continue;
+ }
- if (Model.getFacade().isAClassifier(parent))
- if (findAssociation(parent, depth + 1))
+ if (Model.getFacade().isAClassifier(parent)) {
+ if (findAssociation(parent, depth + 1)) {
return true;
+ }
+ }
}
if (Model.getFacade().isAUseCase(dm)) {
@@ -173,24 +183,30 @@
while (iter2.hasNext()) {
Object parent = Model.getFacade().getExtension(iter2.next());
- if (parent == dm)
+ if (parent == dm) {
continue;
+ }
- if (Model.getFacade().isAClassifier(parent))
- if (findAssociation(parent, depth + 1))
+ if (Model.getFacade().isAClassifier(parent)) {
+ if (findAssociation(parent, depth + 1)) {
return true;
+ }
+ }
}
Iterator iter3 = Model.getFacade().getIncludes(dm).iterator();
while (iter3.hasNext()) {
Object parent = Model.getFacade().getBase(iter3.next());
- if (parent == dm)
+ if (parent == dm) {
continue;
+ }
- if (Model.getFacade().isAClassifier(parent))
- if (findAssociation(parent, depth + 1))
+ if (Model.getFacade().isAClassifier(parent)) {
+ if (findAssociation(parent, depth + 1)) {
return true;
+ }
+ }
}
}
return false;
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java 2011-07-20 05:10:13-0700
@@ -146,16 +146,18 @@
}
// I am only prepared to go this far.
- if (depth > MAX_DEPTH)
+ if (depth > MAX_DEPTH) {
return false;
+ }
Iterator iter = Model.getFacade().getGeneralizations(dm).iterator();
while (iter.hasNext()) {
Object parent = Model.getFacade().getGeneral(iter.next());
- if (parent == dm)
- continue;
+ if (parent == dm) {
+ continue;
+ }
if (Model.getFacade().isAClassifier(parent)
&& findChangeableInstanceAttributeInInherited(
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOperations.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOperations.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOperations.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOperations.java 2011-07-20 05:10:13-0700
@@ -129,16 +129,18 @@
}
}
- if (depth > 50)
+ if (depth > 50) {
return false;
+ }
Iterator iter = Model.getFacade().getGeneralizations(dm).iterator();
while (iter.hasNext()) {
Object parent = Model.getFacade().getGeneral(iter.next());
- if (parent == dm)
- continue;
+ if (parent == dm) {
+ continue;
+ }
if (Model.getFacade().isAClassifier(parent)
&& findInstanceOperationInInherited(parent, depth + 1)) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodeInsideElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodeInsideElement.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodeInsideElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodeInsideElement.java 2011-07-20 05:10:13-0700
@@ -123,7 +123,9 @@
Collection figs = dd.getLayer().getContents();
ListSet offs = null;
for (Object obj : figs) {
- if (!(obj instanceof FigMNode)) continue;
+ if (!(obj instanceof FigMNode)) {
+ continue;
+ }
FigMNode fn = (FigMNode) obj;
if (fn.getEnclosingFig() != null) {
if (offs == null) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java 2011-07-20 05:10:13-0700
@@ -97,7 +97,9 @@
}
ListSet offs = computeOffenders(d);
- if (offs == null) return NO_PROBLEM;
+ if (offs == null) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -156,13 +158,15 @@
if (!(d instanceof UMLDeploymentDiagram)) {
if (fni instanceof FigNodeModelElement) {
if (((FigNodeModelElement) fni).getEnclosingFig()
- == fnj)
+ == fnj) {
continue;
+ }
}
if (fnj instanceof FigNodeModelElement) {
if (((FigNodeModelElement) fnj).getEnclosingFig()
- == fni)
+ == fni) {
continue;
+ }
}
}
// In DeploymentDiagrams the situation is not the
@@ -176,8 +180,9 @@
|| (fni instanceof FigObject)))
|| (!((fnj instanceof FigClass)
|| (fnj instanceof FigInterface)
- || (fnj instanceof FigObject))))
+ || (fnj instanceof FigObject)))) {
continue;
+ }
}
if (offs == null) {
offs = new ListSet();
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrObjectWithoutClassifier.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrObjectWithoutClassifier.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrObjectWithoutClassifier.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrObjectWithoutClassifier.java 2011-07-20 05:10:13-0700
@@ -76,7 +76,9 @@
}
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
- if (offs == null) return NO_PROBLEM;
+ if (offs == null) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -129,7 +131,9 @@
Object mobj = fo.getOwner();
if (mobj != null) {
Collection col = Model.getFacade().getClassifiers(mobj);
- if (col.size() > 0) continue;
+ if (col.size() > 0) {
+ continue;
+ }
}
if (offs == null) {
offs = new ListSet();
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java 2011-07-20 05:10:13-0700
@@ -135,8 +135,8 @@
// Get all the features (giving up if there are none). Then loop
// through finding all operations. Each time we find one, we compare
- // its signature with all previous (held in collection operSeen), and then
- // if it doesn't match add it to the collection.
+ // its signature with all previous (held in collection operSeen),
+ // and then if it doesn't match add it to the collection.
Collection operSeen = new ArrayList();
for (Object op : Model.getFacade().getOperations(dm)) {
@@ -237,19 +237,22 @@
Object p1 = null;
while (p1 == null && params1.hasNext()) {
p1 = params1.next();
- if (Model.getFacade().isReturn(p1))
+ if (Model.getFacade().isReturn(p1)) {
p1 = null;
+ }
}
Object p2 = null;
while (p2 == null && params1.hasNext()) {
p2 = params1.next();
- if (Model.getFacade().isReturn(p2))
+ if (Model.getFacade().isReturn(p2)) {
p2 = null;
+ }
}
- if (p1 == null && p2 == null)
- return true; // Both lists have the same length
+ if (p1 == null && p2 == null) {
+ return true; // Both lists have the same length
+ }
// Different lengths:
if (p1 == null || p2 == null) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java 2011-07-20 05:10:13-0700
@@ -125,7 +125,9 @@
*/
public ListSet computeOffenders(Object cls) {
Collection asc = Model.getFacade().getAssociationEnds(cls);
- if (asc == null || asc.size() == 0) return null;
+ if (asc == null || asc.size() == 0) {
+ return null;
+ }
Enumeration descendEnum =
GenDescendantClasses.getSINGLETON().gen(cls);
@@ -133,8 +135,9 @@
return null;
}
ListSet descendants = new ListSet();
- while (descendEnum.hasMoreElements())
+ while (descendEnum.hasMoreElements()) {
descendants.add(descendEnum.nextElement());
+ }
//TODO: GenNavigableClasses?
ListSet offs = null;
@@ -145,8 +148,9 @@
continue;
}
Object otherEnd = conn.get(0);
- if (ae == conn.get(0))
- otherEnd = conn.get(1);
+ if (ae == conn.get(0)) {
+ otherEnd = conn.get(1);
+ }
if (!Model.getFacade().isNavigable(otherEnd)) {
continue;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java 2011-07-20 05:10:13-0700
@@ -71,13 +71,17 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isAClassifier(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAClassifier(dm))) {
+ return NO_PROBLEM;
+ }
// TODO: consider inherited associations?
// TODO: self loops are double counted
int threshold = getThreshold();
Collection aes = Model.getFacade().getAssociationEnds(dm);
- if (aes == null || aes.size() <= threshold) return NO_PROBLEM;
+ if (aes == null || aes.size() <= threshold) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrWrongLinkEnds.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrWrongLinkEnds.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrWrongLinkEnds.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrWrongLinkEnds.java 2011-07-20 05:10:13-0700
@@ -129,7 +129,9 @@
continue;
}
FigLink figLink = (FigLink) obj;
- if (!(Model.getFacade().isALink(figLink.getOwner()))) continue;
+ if (!(Model.getFacade().isALink(figLink.getOwner()))) {
+ continue;
+ }
Object link = figLink.getOwner();
Collection ends = Model.getFacade().getConnections(link);
if (ends != null && (ends.size() > 0)) {
@@ -141,14 +143,16 @@
Collection residencies =
Model.getFacade().getResidents(instance);
if (residencies != null
- && (residencies.size() > 0))
+ && (residencies.size() > 0)) {
count = count + 2;
+ }
}
Object component =
Model.getFacade().getComponentInstance(instance);
- if (component != null)
- count = count + 1;
+ if (component != null) {
+ count = count + 1;
+ }
}
if (count == 3) {
if (offs == null) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java 2011-07-20 05:10:13-0700
@@ -44,7 +44,6 @@
import org.argouml.application.api.AbstractArgoJPanel;
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.application.api.InitSubsystem;
-import org.argouml.profile.ProfileFacade;
/**
* Registers critics for use in ArgoUML. This class is called at
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/UMLWizard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/UMLWizard.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/UMLWizard.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/UMLWizard.java 2011-07-20 05:10:13-0700
@@ -96,7 +96,9 @@
* @return the suggestion string
*/
public String offerSuggestion() {
- if (suggestion != null) return suggestion;
+ if (suggestion != null) {
+ return suggestion;
+ }
Object me = getModelElement();
if (me != null) {
String n = Model.getFacade().getName(me);
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizMEName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizMEName.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizMEName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizMEName.java 2011-07-20 05:10:13-0700
@@ -112,10 +112,14 @@
* @see org.argouml.cognitive.critics.Wizard#canGoNext()
*/
public boolean canGoNext() {
- if (!super.canGoNext()) return false;
+ if (!super.canGoNext()) {
+ return false;
+ }
if (step1 != null) {
boolean changed = origSuggest.equals(step1.getText());
- if (mustEdit && !changed) return false;
+ if (mustEdit && !changed) {
+ return false;
+ }
}
return true;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizManyNames.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizManyNames.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizManyNames.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizManyNames.java 2011-07-20 05:10:13-0700
@@ -40,7 +40,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Vector;
import javax.swing.JPanel;
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizTooMany.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizTooMany.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizTooMany.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/WizTooMany.java 2011-07-20 05:10:13-0700
@@ -97,8 +97,12 @@
* @see org.argouml.cognitive.ui.Wizard#canFinish()
*/
public boolean canFinish() {
- if (!super.canFinish()) return false;
- if (getStep() == 0) return true;
+ if (!super.canFinish()) {
+ return false;
+ }
+ if (getStep() == 0) {
+ return true;
+ }
if (getStep() == 1 && step1 != null) {
try {
Integer.parseInt(step1.getText());
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ExtensionPointsCompartmentContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ExtensionPointsCompartmentContainer.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ExtensionPointsCompartmentContainer.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ExtensionPointsCompartmentContainer.java 2011-07-20 05:10:13-0700
@@ -42,8 +42,9 @@
* An interface to be implemented by any Fig that contains
* a Extensions Compartment.
*@deprecated in 0.29.2 by MVW. We can't assume at compile time what
- * Figs contain what compartments. This is proved in the UML1.4 to UML2 conversion
- * where UML1.4 does not want this interface for FigInterface but UML2 does.
+ * Figs contain what compartments. This is proved in the UML1.4 to
+ * UML2 conversion where UML1.4 does not want this interface for
+ * FigInterface but UML2 does.
* Use FigCompartment.getCompartment(Object metaType) to fetch a compartment
* and check the existence and methods of the returned object.
* @author mvw
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java 2011-07-20 05:10:13-0700
@@ -193,7 +193,7 @@
name = entry.getKey();
value = entry.getValue();
- if(fig instanceof FigCompartmentBox) {
+ if (fig instanceof FigCompartmentBox) {
FigCompartmentBox fcb = (FigCompartmentBox) fig;
if ("operationsVisible".equals(name)) {
fcb.showCompartment(
@@ -225,7 +225,8 @@
public FigEdge getFigEdgeFor(Object edge, Map styleAttributes) {
return null;
// if (edge == null) {
-// throw new IllegalArgumentException("A model edge must be supplied");
+// throw new IllegalArgumentException(
+// "A model edge must be supplied");
// }
// FigEdge newEdge = null;
// if (Model.getFacade().isAAssociationClass(edge)) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java 2011-07-20 05:10:13-0700
@@ -40,7 +40,6 @@
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.uml.diagram.DiagramEdgeSettings;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java 2011-07-20 05:10:13-0700
@@ -214,7 +214,8 @@
getActionGeneralize(),
getActionDepend(),
null,
- getActionMessage(), //this one behaves differently, hence seperated!
+ //this one behaves differently, hence seperated:
+ getActionMessage(),
};
return actions;
} else {
@@ -224,7 +225,8 @@
getActionGeneralize(),
getActionDepend(),
null,
- getActionMessage(), //this one behaves differently, hence seperated!
+ //this one behaves differently, hence seperated:
+ getActionMessage(),
};
return actions;
}
@@ -514,7 +516,7 @@
node =
Model.getCollaborationsFactory().buildClassifierRole(
collaboration);
- }
+ }
Model.getCollaborationsHelper().addBase(node, base);
return node;
@@ -608,7 +610,7 @@
@Override
public String getInstructions(Object droppedObject) {
if (Model.getFacade().isAClassifierRole(droppedObject)) {
- return super.getInstructions(droppedObject);
+ return super.getInstructions(droppedObject);
} else if (Model.getFacade().isAClassifier(droppedObject)) {
return Translator.localize(
"misc.message.click-on-diagram-to-add-as-cr",
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java 2011-07-20 05:10:13-0700
@@ -67,7 +67,9 @@
}
public void actionPerformed(ActionEvent e) {
- if (!isEnabled()) return;
+ if (!isEnabled()) {
+ return;
+ }
super.actionPerformed(e);
Object target = TargetManager.getInstance().getModelTarget();
Object model = Model.getFacade().getInnerContainingModel(target);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java 2011-07-20 05:10:13-0700
@@ -371,8 +371,8 @@
@Override
protected void updateLayout(UmlChangeEvent event) {
/* We only handle the case where a region has been removed: */
- if (!(event instanceof RemoveAssociationEvent) ||
- !"subvertex".equals(event.getPropertyName())) {
+ if (!(event instanceof RemoveAssociationEvent)
+ || !"subvertex".equals(event.getPropertyName())) {
return;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java 2011-07-20 05:10:13-0700
@@ -484,8 +484,9 @@
// event processing
protected void modelChanged(PropertyChangeEvent mee) {
- // TODO: Rather than specifically ignore some item maybe it would be better
- // to specifically state what items are of interest. Otherwise we may still
+ // TODO: Rather than specifically ignore some item
+ // maybe it would be better to specifically state
+ // what items are of interest. Otherwise we may still
// be acting on other events we don't need
if (!Model.getFacade().isATransition(mee.getNewValue())
&& !("container".equals(mee.getPropertyName()))
@@ -546,8 +547,8 @@
@Override
protected void updateLayout(UmlChangeEvent event) {
- if (!"container".equals(event.getPropertyName()) &&
- !"isConcurrent".equals(event.getPropertyName())) {
+ if (!"container".equals(event.getPropertyName())
+ && !"isConcurrent".equals(event.getPropertyName())) {
super.updateLayout(event);
}
final String eName = event.getPropertyName();
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigRegion.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigRegion.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigRegion.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigRegion.java 2011-07-20 05:10:13-0700
@@ -25,11 +25,10 @@
* Construct a fig representing a region.
*
* @param region owning UML element
- * @param bounds position and size
*/
public FigRegion(
final Object region) {
- super(0,0,0,0);
+ super(0, 0, 0, 0);
setLineWidth(0);
setOwner(region);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigVertex.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigVertex.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigVertex.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigVertex.java 2011-07-20 05:10:13-0700
@@ -13,7 +13,6 @@
package org.argouml.uml.diagram.state.ui;
-import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics;
@@ -107,14 +106,15 @@
List regions = Model.getStateMachinesHelper().getRegions(
encloser.getOwner());
if (regions.isEmpty()) {
- // There are no regions so create one and place the vertex there.
+ // There are no regions so create one and
+ // place the vertex there.
region = Model.getUmlFactory().buildNode(
Model.getMetaTypes().getRegion(), encloser.getOwner());
} else {
// There are one or more regions so find the one that the
//vertex was dropped in
FigVertex compositeState = (FigVertex) encloser;
- for (DiagramElement de :
+ for (DiagramElement de :
compositeState.regionCompartment.getDiagramElements()) {
if (((Fig) de).getBounds().contains(getBounds())) {
region = de.getOwner();
@@ -157,8 +157,8 @@
getNameFig().setLineWidth(0);
getNameFig().setFilled(false);
- bodyText = new FigBody(0,0,0,0);
- regionCompartment = new FigRegionCompartment(0,0,0,0);
+ bodyText = new FigBody(0, 0, 0, 0);
+ regionCompartment = new FigRegionCompartment(0, 0, 0, 0);
addFig(getBigPort());
addFig(getNameFig());
@@ -199,7 +199,7 @@
protected void modelChanged(PropertyChangeEvent mee) {
super.modelChanged(mee);
- assert(mee.getPropertyName().equals("region"));
+ assert (mee.getPropertyName().equals("region"));
if (mee instanceof AddAssociationEvent) {
// TODO: Before adding a new region make the last region
@@ -212,7 +212,8 @@
regionCompartment.getX(), regionCompartment.getY(),
rg.getMinimumSize().width, rg.getMinimumSize().height);
- // Temporary start - colour the regions so that we can see them for now
+ // Temporary start - colour the regions so that we can
+ // see them for now
// rg.setFillColor(COLOR_ARRAY[nextColor++]);
// if (nextColor >= COLOR_ARRAY.length) {
// nextColor = 0;
@@ -285,7 +286,9 @@
}
}
- public void notationRenderingChanged(NotationProvider np, String rendering) {
+ public void notationRenderingChanged(
+ NotationProvider np,
+ String rendering) {
super.notationRenderingChanged(np, rendering);
if (notationProviderBody == np) {
bodyText.setText(rendering);
@@ -499,7 +502,9 @@
fig.getY() + fig.getHeight(),
fig.getX() + fig.getWidth(),
fig.getY() + fig.getHeight(),
- 0, new float [] { 5.0f, 5.0f }, 10);
+ 0, new float [] {
+ 5.0f, 5.0f },
+ 10);
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java 2011-07-20 05:10:13-0700
@@ -453,7 +453,7 @@
if (Model.getFacade().isANaryAssociation(association)
&& canAddEdge(associationEnd)) {
addEdge(associationEnd);
- } else if (canAddEdge(association)){
+ } else if (canAddEdge(association)) {
addEdge(association);
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClass.java 2011-07-20 05:10:13-0700
@@ -45,7 +45,6 @@
import org.argouml.model.Model;
import org.argouml.uml.diagram.DiagramSettings;
-import org.argouml.uml.diagram.ui.FigAttributesCompartment;
import org.tigris.gef.base.Selection;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigGroup;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigFeature.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigFeature.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigFeature.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigFeature.java 2011-07-20 05:10:13-0700
@@ -44,9 +44,6 @@
import org.argouml.model.Model;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.ui.CompartmentFigText;
-import org.tigris.gef.base.Selection;
-import org.tigris.gef.presentation.Fig;
-import org.tigris.gef.presentation.Handle;
/**
* Fig to show features in class or interface like attributes or operations.<p>
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/SelectionInterface.java 2011-07-20 05:10:13-0700
@@ -43,9 +43,8 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.ui.SelectionNodeClarifiers2;
-import org.tigris.gef.presentation.Fig;
import org.argouml.uml.diagram.ui.SelectionClassifierBox;
+import org.tigris.gef.presentation.Fig;
/**
* @author [email protected]
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionSetAddAssociationMode.java 2011-07-20 05:10:13-0700
@@ -45,7 +45,6 @@
import org.argouml.model.Model;
-import org.tigris.gef.base.ModeCreatePolyEdge;
/**
* An extension of ActionSetMode to set the parameters for an association.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java 2011-07-20 05:10:13-0700
@@ -38,9 +38,9 @@
package org.argouml.uml.diagram.ui;
-import java.awt.Color;
import java.awt.Graphics;
import java.awt.Rectangle;
+
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.static_structure.ui.SelectionCompartmentText;
import org.tigris.gef.base.Selection;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java 2011-07-20 05:10:13-0700
@@ -459,8 +459,9 @@
int destDeterminingFactor =
getSquaredDistance(p, lastPoint);
- return destDeterminingFactor < rSquared || (srcDeterminingFactor < rSquared
- && srcDeterminingFactor < destDeterminingFactor);
+ return destDeterminingFactor < rSquared
+ || (srcDeterminingFactor < rSquared
+ && srcDeterminingFactor < destDeterminingFactor);
}
private void buildMultiplicityMenu(
@@ -809,7 +810,7 @@
@Override
public void propertyChange(PropertyChangeEvent pce) {
super.propertyChange(pce);
- assert(getGroup() != null);
+ assert (getGroup() != null);
this.getGroup().calcBounds();
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java 2011-07-20 05:10:13-0700
@@ -39,7 +39,6 @@
package org.argouml.uml.diagram.ui;
import java.awt.Color;
-import java.awt.Graphics;
import java.util.HashSet;
import java.util.Set;
@@ -104,13 +103,11 @@
return NotationProviderFactory2.TYPE_ASSOCIATION_END_NAME;
}
- @SuppressWarnings("deprecation")
@Override
protected void initNotationProviders(Object own) {
initializeNotationProvidersInternal(own);
}
- @SuppressWarnings("deprecation")
private void initializeNotationProvidersInternal(Object own) {
super.initNotationProviders(own);
destMult.initNotationProviders();
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java 2011-07-20 05:10:13-0700
@@ -41,11 +41,8 @@
import java.awt.Rectangle;
import java.util.Collection;
-
import org.argouml.model.Model;
-import org.argouml.model.Defaults;
import org.argouml.notation.NotationProviderFactory2;
-
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.static_structure.ui.FigAttribute;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartment.java 2011-07-20 05:10:13-0700
@@ -90,7 +90,8 @@
private Fig externalSeparatorFig = new FigSeparator(X0, Y0, 11, LINE_WIDTH);
/**
- * If true the last element will be editable when the populate method completes
+ * If true the last element will be editable when
+ * the populate method completes.
*/
private boolean editOnRedraw;
@@ -205,7 +206,7 @@
int currentHeight = 0;
- for (Fig fig : (List<Fig>) getFigs()) {
+ for (Fig fig : getFigs()) {
if (fig.isVisible() && fig != getBigPort()) {
int fh = fig.getMinimumSize().height;
@@ -224,7 +225,12 @@
protected void createModelElement() {
Project project = getProject();
Defaults defaults = project.getDefaults();
- Object attr = Model.getUmlFactory().buildNode(getCompartmentType(), getOwner(), null, defaults);
+ Object attr =
+ Model.getUmlFactory().buildNode(
+ getCompartmentType(),
+ getOwner(),
+ null,
+ defaults);
TargetManager.getInstance().setTarget(attr);
}
@@ -455,7 +461,8 @@
}
/* Find the compartment fig for this umlObject: */
- private CompartmentFigText findCompartmentFig(List<CompartmentFigText> figs,
+ private CompartmentFigText findCompartmentFig(
+ List<CompartmentFigText> figs,
Object umlObject) {
for (CompartmentFigText fig : figs) {
if (fig.getOwner() == umlObject) {
@@ -601,8 +608,9 @@
* @return true if the hit rectangle strikes this fig
*/
public boolean hit(Rectangle r) {
- if (!isVisible() || !isSelectable())
+ if (!isVisible() || !isSelectable()) {
return false;
+ }
final int cornersHit =
countCornersContained(r.x, r.y, r.width, r.height);
return cornersHit > 0;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java 2011-07-20 05:10:13-0700
@@ -543,7 +543,9 @@
public void showCompartment(Object metaType, boolean visible) {
FigCompartment fc =
getCompartment(metaType);
- if (fc == null) return;
+ if (fc == null) {
+ return;
+ }
assert fc != null;
setCompartmentVisible(fc, visible);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigDependency.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigDependency.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigDependency.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigDependency.java 2011-07-20 05:10:13-0700
@@ -38,8 +38,6 @@
package org.argouml.uml.diagram.ui;
-import java.awt.Color;
-
import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.presentation.ArrowHead;
import org.tigris.gef.presentation.ArrowHeadGreater;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigExtensionPointsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigExtensionPointsCompartment.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigExtensionPointsCompartment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigExtensionPointsCompartment.java 2011-07-20 05:10:13-0700
@@ -45,7 +45,6 @@
import org.argouml.model.Model;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.use_case.ui.FigExtensionPoint;
@@ -88,7 +87,7 @@
@Override
public String getName() {
- return "extension points";
+ return "extension points";
}
/**
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2011-07-20 05:10:13-0700
@@ -614,7 +614,7 @@
for (Action a : modulesActions) {
if (a instanceof List) {
- JMenu m = new JMenu((Action) a);
+ JMenu m = new JMenu(a);
popUpActions.add(m);
for (Action subAction : (List<Action>) a) {
m.add(subAction);
@@ -2285,7 +2285,6 @@
* @param project the project
* @deprecated
*/
- @SuppressWarnings("deprecation")
@Deprecated
public void setProject(Project project) {
throw new UnsupportedOperationException();
@@ -2353,15 +2352,16 @@
.getProfileConfiguration().getFigNodeStrategy();
Iterator<FigStereotype> figsIterator = getStereotypeFig()
.getStereotypeFigs().iterator();
- Object owner = figsIterator.hasNext() ?
- figsIterator.next().getOwner() : null;
+ Object owner =
+ figsIterator.hasNext()
+ ? figsIterator.next().getOwner() : null;
if (stereotypeCount != 1
|| figNodeStrategy == null
|| owner == null
|| (stereotypeCount == 1
&& figNodeStrategy.getIconForStereotype(owner)
== null)) {
- practicalView = DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL;
+ practicalView = DiagramAppearance.STEREOTYPE_VIEW_TEXTUAL;
}
}
}
@@ -2627,7 +2627,6 @@
* is implemented in GEF, so we'll leave this implementation
* here to block any attempts to use it within ArgoUML.
*/
- @SuppressWarnings("deprecation")
@Deprecated
public void setOwner(Object owner) {
if (owner != getOwner()) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java 2011-07-20 05:10:13-0700
@@ -43,10 +43,8 @@
import java.awt.Rectangle;
import java.util.Collection;
-import org.argouml.kernel.Project;
import org.argouml.model.Model;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.DiagramSettings;
import org.argouml.uml.diagram.static_structure.ui.FigOperation;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigTextGroup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigTextGroup.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigTextGroup.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigTextGroup.java 2011-07-20 05:10:13-0700
@@ -38,11 +38,9 @@
package org.argouml.uml.diagram.ui;
-import java.awt.Point;
import java.awt.Rectangle;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
-import java.util.List;
import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.presentation.Fig;
@@ -88,7 +86,7 @@
*/
private void updateFigTexts() {
int height = 0;
- for (Fig fig : (List<Fig>) getFigs()) {
+ for (Fig fig : getFigs()) {
int figHeight = fig.getMinimumSize().height;
fig.setBounds(getX(), getY() + height, fig.getWidth(), figHeight);
fig.endTrans();
@@ -109,7 +107,7 @@
// calculate the total height
int maxWidth = 0;
int height = 0;
- for (Fig fig : (List<Fig>) getFigs()) {
+ for (Fig fig : getFigs()) {
// fig.calcBounds();
if (fig.getWidth() > maxWidth) {
maxWidth = fig.getWidth();
@@ -127,7 +125,7 @@
*/
@Override
public void removeFromDiagram() {
- for (Fig fig : (List<Fig>) getFigs()) {
+ for (Fig fig : getFigs()) {
fig.removeFromDiagram();
}
super.removeFromDiagram();
@@ -138,7 +136,7 @@
*/
@Override
public void deleteFromModel() {
- for (Fig fig : (List<Fig>) getFigs()) {
+ for (Fig fig : getFigs()) {
fig.deleteFromModel();
}
super.deleteFromModel();
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationEnd.java 2011-07-20 05:10:13-0700
@@ -44,7 +44,6 @@
import org.argouml.model.IllegalModelElementConnectionException;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.static_structure.ui.FigClass;
import org.argouml.uml.diagram.static_structure.ui.FigClassifierBox;
import org.tigris.gef.base.Layer;
import org.tigris.gef.base.LayerPerspective;
@@ -176,7 +175,8 @@
// Detach any edges (such as comment edges) already attached
// to the FigAssociation before the FigAssociation is removed.
// They'll later be re-attached to the new FigNodeAssociation
- final Collection<FigEdge> existingEdges = originalEdgePort.getFigEdges();
+ final Collection<FigEdge> existingEdges =
+ originalEdgePort.getFigEdges();
for (FigEdge edge : existingEdges) {
if (edge instanceof FigEdgeAssociationClass) {
// If there are bits of an association class then
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeLabelDrag.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeLabelDrag.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeLabelDrag.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeLabelDrag.java 2011-07-20 05:10:13-0700
@@ -128,7 +128,7 @@
Point clickPoint = me.getPoint();
Fig underMouse = editor.hit(clickPoint);
if (underMouse instanceof FigEdge) {
- List<Fig> figList = ((FigEdge)underMouse).getPathItemFigs();
+ List<Fig> figList = ((FigEdge) underMouse).getPathItemFigs();
for (Fig fig : figList) {
if (fig.contains(clickPoint)) {
// Consume to stop other modes from trying to take over
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/SettingsTabDiagramAppearance.java 2011-07-20 05:10:13-0700
@@ -66,7 +66,6 @@
import org.argouml.ui.ShadowComboBox;
import org.argouml.uml.diagram.DiagramAppearance;
import org.argouml.uml.diagram.DiagramSettings;
-import org.argouml.uml.diagram.DiagramUndoManager;
import org.argouml.util.ArgoFrame;
import org.tigris.gef.undo.Memento;
@@ -271,7 +270,8 @@
selectedDiagramFontName);
Configuration.setInteger(DiagramAppearance.KEY_FONT_SIZE,
selectedDiagramFontSize);
- Configuration.setBoolean(DiagramAppearance.KEY_HIDE_BIDIRECTIONAL_ARROWS,
+ Configuration.setBoolean(
+ DiagramAppearance.KEY_HIDE_BIDIRECTIONAL_ARROWS,
hideBidirectionalArrows.isSelected());
Configuration.setInteger(DiagramAppearance.KEY_DEFAULT_SHADOW_WIDTH,
defaultShadowWidth.getSelectedIndex());
@@ -285,7 +285,8 @@
ds.setFontName(selectedDiagramFontName);
ds.setFontSize(selectedDiagramFontSize);
ds.setDefaultShadowWidth(defaultShadowWidth.getSelectedIndex());
- ds.setShowBidirectionalArrows(!hideBidirectionalArrows.isSelected());
+ ds.setShowBidirectionalArrows(
+ !hideBidirectionalArrows.isSelected());
/* Update the diagram, and other users of these settings: */
Memento memento = new Memento() {
@@ -298,11 +299,12 @@
}
};
// TODO: Undo should be managed externally or we should be given
- // an Undo manager to use (the project's) rather than using a global one
+ // an Undo manager to use (the project's) rather than using a
+ // global one
// if (DiagramUndoManager.getInstance().isGenerateMementos()) {
// DiagramUndoManager.getInstance().addMemento(memento);
// }
- memento.redo();
+ memento.redo();
}
}
@@ -381,7 +383,9 @@
*/
public void setVisible(boolean arg0) {
super.setVisible(arg0);
- if (arg0) handleSettingsTabRefresh();
+ if (arg0) {
+ handleSettingsTabRefresh();
+ }
}
public void setProject(Project project) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/StylePanelFigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/StylePanelFigMessage.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/StylePanelFigMessage.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/StylePanelFigMessage.java 2011-07-20 05:10:13-0700
@@ -53,9 +53,11 @@
*/
public class StylePanelFigMessage extends StylePanelFigNodeModelElement {
- private JLabel arrowLabel = new JLabel(Translator.localize("label.localize"));
+ private JLabel arrowLabel =
+ new JLabel(Translator.localize("label.localize"));
- private JComboBox arrowField = new JComboBox(FigMessage.getArrowDirections().toArray());
+ private JComboBox arrowField =
+ new JComboBox(FigMessage.getArrowDirections().toArray());
/**
@@ -95,7 +97,9 @@
public void setTargetArrow() {
String ad = (String) arrowField.getSelectedItem();
int arrowDirection = FigMessage.getArrowDirections().indexOf(ad);
- if (getPanelTarget() == null || arrowDirection == -1) return;
+ if (getPanelTarget() == null || arrowDirection == -1) {
+ return;
+ }
((FigMessage) getPanelTarget()).setArrow(arrowDirection);
getPanelTarget().endTrans();
}
@@ -106,10 +110,12 @@
@Override
public void itemStateChanged(ItemEvent e) {
Object src = e.getSource();
- if (src == arrowField)
+ if (src == arrowField) {
setTargetArrow();
- else
+ }
+ else {
super.itemStateChanged(e);
+ }
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionAddDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionAddDiagram.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionAddDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionAddDiagram.java 2011-07-20 05:10:13-0700
@@ -39,7 +39,6 @@
package org.argouml.uml.ui;
import java.awt.event.ActionEvent;
-import java.util.Collection;
import java.util.Iterator;
import javax.swing.Action;
@@ -50,11 +49,11 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.ui.UndoableAction;
import org.argouml.ui.explorer.ExplorerEventAdaptor;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramSettings;
-import org.argouml.ui.UndoableAction;
/**
* Abstract class that is the parent of all actions adding diagrams to ArgoUML.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionCollaborationDiagram.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionCollaborationDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionCollaborationDiagram.java 2011-07-20 05:10:13-0700
@@ -38,12 +38,7 @@
package org.argouml.uml.ui;
-import java.awt.event.ActionEvent;
-
-import org.argouml.kernel.Project;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.explorer.ExplorerEventAdaptor;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRemoveModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRemoveModelElement.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRemoveModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRemoveModelElement.java 2011-07-20 05:10:13-0700
@@ -75,8 +75,9 @@
super.actionPerformed(e);
Project p = ProjectManager.getManager().getCurrentProject();
if (getObjectToRemove() != null
- && ActionDeleteModelElements.sureRemove(getObjectToRemove()))
+ && ActionDeleteModelElements.sureRemove(getObjectToRemove())) {
p.moveToTrash(getObjectToRemove());
+ }
setObjectToRemove(null);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionReopenProject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionReopenProject.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionReopenProject.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionReopenProject.java 2011-07-20 05:10:13-0700
@@ -89,7 +89,9 @@
* project
*/
public void actionPerformed(ActionEvent e) {
- if (!ProjectBrowser.getInstance().askConfirmationAndSave()) return;
+ if (!ProjectBrowser.getInstance().askConfirmationAndSave()) {
+ return;
+ }
File toOpen = new File(filename);
// load of the new project
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSaveAllGraphics.java 2011-07-20 05:10:13-0700
@@ -285,7 +285,9 @@
LOG.error("exception in opening JFileChooser", ex);
}
- if ( chooser == null ) chooser = new JFileChooser();
+ if ( chooser == null ) {
+ chooser = new JFileChooser();
+ }
chooser.setDialogTitle(
Translator.localize("filechooser.save-all-graphics"));
chooser.setDialogType(JFileChooser.OPEN_DIALOG);
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSetMultiplicity.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSetMultiplicity.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSetMultiplicity.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionSetMultiplicity.java 2011-07-20 05:10:13-0700
@@ -72,8 +72,9 @@
if (source instanceof UMLComboBox2) {
Object selected = ((UMLComboBox2) source).getSelectedItem();
Object target = ((UMLComboBox2) source).getTarget();
- if (target != null && selected != null)
+ if (target != null && selected != null) {
setSelectedItem(selected, target);
+ }
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java 2011-07-20 05:10:13-0700
@@ -100,12 +100,12 @@
/* Follow well-formedness rule for a Class [2].
* Determine the owning namespace for the statemachine: */
while (Model.getFacade().isAClass(namespace)) {
- Object parent = Model.getFacade().getNamespace(namespace);
- if (parent == null) {
- break;
- }
- namespace = parent;
- }
+ Object parent = Model.getFacade().getNamespace(namespace);
+ if (parent == null) {
+ break;
+ }
+ namespace = parent;
+ }
}
Model.getCoreHelper().setNamespace(machine, namespace);
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/TabProps.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/TabProps.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/TabProps.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/TabProps.java 2011-07-20 05:10:13-0700
@@ -280,7 +280,9 @@
for (PropPanelFactory factory
: PropPanelFactoryManager.getFactories()) {
propPanel = factory.createPropPanel(targetObject);
- if (propPanel != null) return propPanel;
+ if (propPanel != null) {
+ return propPanel;
+ }
}
/* This does not work (anymore/yet?),
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLEditableComboBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLEditableComboBox.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/UMLEditableComboBox.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLEditableComboBox.java 2011-07-20 05:10:13-0700
@@ -190,11 +190,13 @@
if (((UMLComboBoxModel2) getModel()).contains(anObject)) {
editor.setText(((UMLListCellRenderer2) getRenderer())
.makeText(anObject));
- if (theShowIcon && (anObject != null))
+ if (theShowIcon && (anObject != null)) {
panel.setIcon(ResourceLoaderWrapper.getInstance()
.lookupIcon(anObject));
- } else
+ }
+ } else {
super.setItem(anObject);
+ }
}
@@ -289,8 +291,9 @@
// next statement is necessary to update the textfield
// if the selection is equal to what was allready
// selected
- if (oldValue == getSelectedItem())
+ if (oldValue == getSelectedItem()) {
getEditor().setItem(getSelectedItem());
+ }
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java 2011-07-20 05:10:13-0700
@@ -283,8 +283,9 @@
* @param col the given collection
*/
protected void setAllElements(Collection col) {
- if (!isEmpty())
+ if (!isEmpty()) {
removeAllElements();
+ }
addAll(col);
}
@@ -293,7 +294,9 @@
* @param col the given collection
*/
protected void addAll(Collection col) {
- if (col.size() == 0) return;
+ if (col.size() == 0) {
+ return;
+ }
Iterator it = col.iterator();
fireListEvents = false;
int intervalStart = getSize() == 0 ? 0 : getSize() - 1;
@@ -518,8 +521,9 @@
* Object, int, int)
*/
protected void fireContentsChanged(Object source, int index0, int index1) {
- if (fireListEvents && !buildingModel)
+ if (fireListEvents && !buildingModel) {
super.fireContentsChanged(source, index0, index1);
+ }
}
/*
@@ -527,8 +531,9 @@
* Object, int, int)
*/
protected void fireIntervalAdded(Object source, int index0, int index1) {
- if (fireListEvents && !buildingModel)
+ if (fireListEvents && !buildingModel) {
super.fireIntervalAdded(source, index0, index1);
+ }
}
/*
@@ -536,8 +541,9 @@
* Object, int, int)
*/
protected void fireIntervalRemoved(Object source, int index0, int index1) {
- if (fireListEvents && !buildingModel)
+ if (fireListEvents && !buildingModel) {
super.fireIntervalRemoved(source, index0, index1);
+ }
}
/**
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeListModel.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeListModel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLStereotypeListModel.java 2011-07-20 05:10:13-0700
@@ -280,8 +280,9 @@
* @param col the given collection
*/
protected void setAllElements(Collection col) {
- if (!isEmpty())
+ if (!isEmpty()) {
removeAllElements();
+ }
addAll(col);
}
@@ -290,7 +291,9 @@
* @param col the given collection
*/
protected void addAll(Collection col) {
- if (col.size() == 0) return;
+ if (col.size() == 0) {
+ return;
+ }
Iterator it = col.iterator();
fireListEvents = false;
int intervalStart = getSize() == 0 ? 0 : getSize() - 1;
@@ -515,8 +518,9 @@
* Object, int, int)
*/
protected void fireContentsChanged(Object source, int index0, int index1) {
- if (fireListEvents && !buildingModel)
+ if (fireListEvents && !buildingModel) {
super.fireContentsChanged(source, index0, index1);
+ }
}
/*
@@ -524,8 +528,9 @@
* Object, int, int)
*/
protected void fireIntervalAdded(Object source, int index0, int index1) {
- if (fireListEvents && !buildingModel)
+ if (fireListEvents && !buildingModel) {
super.fireIntervalAdded(source, index0, index1);
+ }
}
/*
@@ -533,8 +538,9 @@
* Object, int, int)
*/
protected void fireIntervalRemoved(Object source, int index0, int index1) {
- if (fireListEvents && !buildingModel)
+ if (fireListEvents && !buildingModel) {
super.fireIntervalRemoved(source, index0, index1);
+ }
}
/**
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLTableCellRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLTableCellRenderer.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/UMLTableCellRenderer.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLTableCellRenderer.java 2011-07-20 05:10:13-0700
@@ -59,10 +59,11 @@
String name = Model.getFacade().getName(value);
setText(name);
} else {
- if (value instanceof String)
+ if (value instanceof String) {
setText((String) value);
- else
+ } else {
setText("");
+ }
}
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/ActionAddEventAsTrigger.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/ActionAddEventAsTrigger.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/ActionAddEventAsTrigger.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/ActionAddEventAsTrigger.java 2011-07-20 05:10:13-0700
@@ -89,8 +89,9 @@
protected List getSelected() {
List vec = new ArrayList();
Object trigger = Model.getFacade().getTrigger(getTarget());
- if (trigger != null)
+ if (trigger != null) {
vec.add(trigger);
+ }
return vec;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java 2011-07-20 05:10:13-0700
@@ -38,7 +38,6 @@
package org.argouml.uml.ui.behavior.activity_graphs;
-import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.Collection;
@@ -85,8 +84,11 @@
// get the current type - normally we won't need this, but who knows?
if (getTarget() != null) {
Object type = Model.getFacade().getType(getTarget());
- if (type != null)
- if (!newList.contains(type)) newList.add(type);
+ if (type != null) {
+ if (!newList.contains(type)) {
+ newList.add(type);
+ }
+ }
}
setElements(newList);
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionAddMessagePredecessor.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionAddMessagePredecessor.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionAddMessagePredecessor.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/ActionAddMessagePredecessor.java 2011-07-20 05:10:13-0700
@@ -53,7 +53,8 @@
* @author [email protected]
* @stereotype singleton
*/
-public class ActionAddMessagePredecessor extends AbstractActionAddModelElement2 {
+public class ActionAddMessagePredecessor
+ extends AbstractActionAddModelElement2 {
private static final ActionAddMessagePredecessor SINGLETON =
new ActionAddMessagePredecessor();
@@ -94,9 +95,10 @@
protected void doIt(Collection selected) {
- if (getTarget() == null)
+ if (getTarget() == null) {
throw new IllegalStateException(
- "doIt may not be called with null target");
+ "doIt may not be called with null target");
+ }
Object message = getTarget();
Model.getCollaborationsHelper().setPredecessors(message, selected);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewActionSequence.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewActionSequence.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewActionSequence.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewActionSequence.java 2011-07-20 05:10:13-0700
@@ -87,7 +87,9 @@
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
- if (!Model.getFacade().isATransition(target)) return;
+ if (!Model.getFacade().isATransition(target)) {
+ return;
+ }
setTarget(target);
super.actionPerformed(e);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewCallAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewCallAction.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewCallAction.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewCallAction.java 2011-07-20 05:10:13-0700
@@ -90,7 +90,9 @@
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
- if (!Model.getFacade().isATransition(target)) return;
+ if (!Model.getFacade().isATransition(target)) {
+ return;
+ }
setTarget(target);
super.actionPerformed(e);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewCreateAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewCreateAction.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewCreateAction.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewCreateAction.java 2011-07-20 05:10:13-0700
@@ -86,7 +86,9 @@
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
- if (!Model.getFacade().isATransition(target)) return;
+ if (!Model.getFacade().isATransition(target)) {
+ return;
+ }
setTarget(target);
super.actionPerformed(e);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewDestroyAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewDestroyAction.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewDestroyAction.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewDestroyAction.java 2011-07-20 05:10:13-0700
@@ -86,7 +86,9 @@
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
- if (!Model.getFacade().isATransition(target)) return;
+ if (!Model.getFacade().isATransition(target)) {
+ return;
+ }
setTarget(target);
super.actionPerformed(e);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewReturnAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewReturnAction.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewReturnAction.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewReturnAction.java 2011-07-20 05:10:13-0700
@@ -87,7 +87,9 @@
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
- if (!Model.getFacade().isATransition(target)) return;
+ if (!Model.getFacade().isATransition(target)) {
+ return;
+ }
setTarget(target);
super.actionPerformed(e);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewSendAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewSendAction.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewSendAction.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewSendAction.java 2011-07-20 05:10:13-0700
@@ -87,7 +87,9 @@
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
- if (!Model.getFacade().isATransition(target)) return;
+ if (!Model.getFacade().isATransition(target)) {
+ return;
+ }
setTarget(target);
super.actionPerformed(e);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewTerminateAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewTerminateAction.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewTerminateAction.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewTerminateAction.java 2011-07-20 05:10:13-0700
@@ -87,7 +87,9 @@
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
- if (!Model.getFacade().isATransition(target)) return;
+ if (!Model.getFacade().isATransition(target)) {
+ return;
+ }
setTarget(target);
super.actionPerformed(e);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewUninterpretedAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewUninterpretedAction.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewUninterpretedAction.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/ActionNewUninterpretedAction.java 2011-07-20 05:10:13-0700
@@ -87,7 +87,9 @@
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
- if (!Model.getFacade().isATransition(target)) return;
+ if (!Model.getFacade().isATransition(target)) {
+ return;
+ }
setTarget(target);
super.actionPerformed(e);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionAddEventAsDeferrableEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionAddEventAsDeferrableEvent.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionAddEventAsDeferrableEvent.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionAddEventAsDeferrableEvent.java 2011-07-20 05:10:13-0700
@@ -106,8 +106,11 @@
@Override
protected void doIt(Collection selected) {
Object state = getTarget();
- if (!Model.getFacade().isAState(state)) return;
- Collection oldOnes = new ArrayList(Model.getFacade()
+ if (!Model.getFacade().isAState(state)) {
+ return;
+ }
+ Collection oldOnes =
+ new ArrayList(Model.getFacade()
.getDeferrableEvents(state));
Collection toBeRemoved = new ArrayList(oldOnes);
for (Object o : selected) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionSetStubStateReferenceState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionSetStubStateReferenceState.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionSetStubStateReferenceState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ActionSetStubStateReferenceState.java 2011-07-20 05:10:13-0700
@@ -80,9 +80,10 @@
Object o = box.getSelectedItem();
if (o != null) {
String name = Model.getStateMachinesHelper().getPath(o);
- if (name != null)
+ if (name != null) {
Model.getStateMachinesHelper()
.setReferenceState(box.getTarget(), name);
+ }
}
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ButtonActionNewGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ButtonActionNewGuard.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ButtonActionNewGuard.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/ButtonActionNewGuard.java 2011-07-20 05:10:13-0700
@@ -67,7 +67,9 @@
}
public void actionPerformed(ActionEvent e) {
- if (!isEnabled()) return;
+ if (!isEnabled()) {
+ return;
+ }
super.actionPerformed(e);
Object target = TargetManager.getInstance().getModelTarget();
Object guard = Model.getFacade().getGuard(target);
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddDataType.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddDataType.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddDataType.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddDataType.java 2011-07-20 05:10:13-0700
@@ -69,18 +69,25 @@
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
Object ns = null;
- if (Model.getFacade().isANamespace(target))
+ if (Model.getFacade().isANamespace(target)) {
ns = target;
- if (Model.getFacade().isAParameter(target))
- if (Model.getFacade().getBehavioralFeature(target) != null)
+ }
+ if (Model.getFacade().isAParameter(target)) {
+ if (Model.getFacade().getBehavioralFeature(target) != null) {
target = Model.getFacade().getBehavioralFeature(target);
- if (Model.getFacade().isAFeature(target))
- if (Model.getFacade().getOwner(target) != null)
+ }
+ }
+ if (Model.getFacade().isAFeature(target)) {
+ if (Model.getFacade().getOwner(target) != null) {
target = Model.getFacade().getOwner(target);
- if (Model.getFacade().isAEvent(target))
+ }
+ }
+ if (Model.getFacade().isAEvent(target)) {
ns = Model.getFacade().getNamespace(target);
- if (Model.getFacade().isAClassifier(target))
+ }
+ if (Model.getFacade().isAClassifier(target)) {
ns = Model.getFacade().getNamespace(target);
+ }
if (Model.getFacade().isAAssociationEnd(target)) {
target = Model.getFacade().getAssociation(target);
ns = Model.getFacade().getNamespace(target);
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumeration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumeration.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumeration.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumeration.java 2011-07-20 05:10:13-0700
@@ -72,18 +72,25 @@
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
Object ns = null;
- if (Model.getFacade().isANamespace(target))
+ if (Model.getFacade().isANamespace(target)) {
ns = target;
- if (Model.getFacade().isAParameter(target))
- if (Model.getFacade().getBehavioralFeature(target) != null)
+ }
+ if (Model.getFacade().isAParameter(target)) {
+ if (Model.getFacade().getBehavioralFeature(target) != null) {
target = Model.getFacade().getBehavioralFeature(target);
- if (Model.getFacade().isAFeature(target))
- if (Model.getFacade().getOwner(target) != null)
+ }
+ }
+ if (Model.getFacade().isAFeature(target)) {
+ if (Model.getFacade().getOwner(target) != null) {
target = Model.getFacade().getOwner(target);
- if (Model.getFacade().isAEvent(target))
+ }
+ }
+ if (Model.getFacade().isAEvent(target)) {
ns = Model.getFacade().getNamespace(target);
- if (Model.getFacade().isAClassifier(target))
+ }
+ if (Model.getFacade().isAClassifier(target)) {
ns = Model.getFacade().getNamespace(target);
+ }
if (Model.getFacade().isAAssociationEnd(target)) {
target = Model.getFacade().getAssociation(target);
ns = Model.getFacade().getNamespace(target);
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewStereotype.java 2011-07-20 05:10:13-0700
@@ -60,7 +60,7 @@
*/
public class ActionNewStereotype extends AbstractActionNewModelElement {
- final static Logger LOG = Logger.getLogger(ActionNewStereotype.class);
+ static final Logger LOG = Logger.getLogger(ActionNewStereotype.class);
/**
* The constructor.
@@ -75,7 +75,9 @@
*/
public void actionPerformed(ActionEvent e) {
Object t = TargetManager.getInstance().getTarget();
- if (t instanceof Fig) t = ((Fig) t).getOwner();
+ if (t instanceof Fig) {
+ t = ((Fig) t).getOwner();
+ }
Project p = ProjectManager.getManager().getCurrentProject();
Object model = p.getModel();
Collection models = p.getModels();
Modified: trunk/src/argouml-app/src/org/argouml/util/CustomSeparator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/util/CustomSeparator.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/util/CustomSeparator.java (original)
+++ trunk/src/argouml-app/src/org/argouml/util/CustomSeparator.java 2011-07-20 05:10:13-0700
@@ -114,8 +114,9 @@
*/
public void reset() {
int i;
- for (i = 0; i < match.length; i++)
+ for (i = 0; i < match.length; i++) {
match[i] = 0;
+ }
}
/**
@@ -144,12 +145,15 @@
*/
public boolean addChar(char c) {
int i;
- for (i = 0; i < match.length - 1; i++)
+ for (i = 0; i < match.length - 1; i++) {
match[i] = match[i + 1];
+ }
match[match.length - 1] = c;
- for (i = 0; i < match.length; i++)
- if (match[i] != pattern[i])
- return false;
+ for (i = 0; i < match.length; i++) {
+ if (match[i] != pattern[i]) {
+ return false;
+ }
+ }
return true;
}
Modified: trunk/src/argouml-app/src/org/argouml/util/MyTokenizer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/util/MyTokenizer.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/util/MyTokenizer.java (original)
+++ trunk/src/argouml-app/src/org/argouml/util/MyTokenizer.java 2011-07-20 05:10:13-0700
@@ -62,9 +62,10 @@
public TokenSep(String str) {
theString = str;
length = str.length();
- if (length > 32)
+ if (length > 32) {
throw new IllegalArgumentException("TokenSep " + str
- + " is " + length + " (> 32) chars long");
+ + " is " + length + " (> 32) chars long");
+ }
pattern = 0;
}
@@ -224,10 +225,12 @@
esced = true;
return false;
}
- if (startChr != 0 && c == startChr)
+ if (startChr != 0 && c == startChr) {
level++;
- if (c == stopChr)
+ }
+ if (c == stopChr) {
level--;
+ }
return level <= 0;
}
}
@@ -302,30 +305,33 @@
isEsc = false;
return false;
}
- if (c == '\\')
- isEsc = true;
- else if (c == '\'')
- isSQuot = false;
+ if (c == '\\') {
+ isEsc = true;
+ } else if (c == '\'') {
+ isSQuot = false;
+ }
return false;
} else if (isDQuot) {
if (isEsc) {
isEsc = false;
return false;
}
- if (c == '\\')
- isEsc = true;
- else if (c == '\"')
- isDQuot = false;
+ if (c == '\\') {
+ isEsc = true;
+ } else if (c == '\"') {
+ isDQuot = false;
+ }
return false;
} else {
- if (c == '\'')
- isSQuot = true;
- else if (c == '\"')
- isDQuot = true;
- else if (c == '(')
- tokLevel++;
- else if (c == ')')
- tokLevel--;
+ if (c == '\'') {
+ isSQuot = true;
+ } else if (c == '\"') {
+ isDQuot = true;
+ } else if (c == '(') {
+ tokLevel++;
+ } else if (c == ')') {
+ tokLevel--;
+ }
return tokLevel <= 0;
}
}
@@ -602,16 +608,18 @@
return s;
}
- if (sIdx >= eIdx)
- throw new NoSuchElementException(
- "No more tokens available");
+ if (sIdx >= eIdx) {
+ throw new NoSuchElementException("No more tokens available");
+ }
- for (sep = delims; sep != null; sep = sep.getNext())
+ for (sep = delims; sep != null; sep = sep.getNext()) {
sep.reset();
+ }
if (customSeps != null) {
- for (i = 0; i < customSeps.size(); i++)
- ((CustomSeparator) customSeps.get(i)).reset();
+ for (i = 0; i < customSeps.size(); i++) {
+ ((CustomSeparator) customSeps.get(i)).reset();
+ }
}
for (i = sIdx; i < eIdx; i++) {
@@ -621,15 +629,18 @@
&& j < customSeps.size(); j++) {
csep = (CustomSeparator) customSeps.get(j);
- if (csep.addChar(c))
+ if (csep.addChar(c)) {
break;
+ }
}
if (customSeps != null && j < customSeps.size()) {
csep = (CustomSeparator) customSeps.get(j);
- while (csep.hasFreePart() && i + 1 < eIdx)
- if (csep.endChar(source.charAt(++i)))
- break;
+ while (csep.hasFreePart() && i + 1 < eIdx) {
+ if (csep.endChar(source.charAt(++i))) {
+ break;
+ }
+ }
i -= Math.min(csep.getPeekCount(), i);
int clen = Math.min(i + 1, source.length());
@@ -650,9 +661,11 @@
break;
}
- for (sep = delims; sep != null; sep = sep.getNext())
- if (sep.addChar(c))
- break;
+ for (sep = delims; sep != null; sep = sep.getNext()) {
+ if (sep.addChar(c)) {
+ break;
+ }
+ }
if (sep != null) {
if (i - sIdx + 1 > sep.length()) {
s = source.substring(sIdx,
@@ -721,9 +734,9 @@
* @throws NullPointerException if s is null.
*/
public void putToken(String s) {
- if (s == null)
- throw new NullPointerException(
- "Cannot put a null token");
+ if (s == null) {
+ throw new NullPointerException("Cannot put a null token");
+ }
putToken = s;
}
@@ -748,8 +761,9 @@
c = str.charAt(idx1);
if (c == '\\') {
idx1++;
- if (idx1 < length)
- val.append(str.charAt(idx1));
+ if (idx1 < length) {
+ val.append(str.charAt(idx1));
+ }
} else if (c == ',') {
break;
} else {
Modified: trunk/src/argouml-app/tests/org/argouml/cognitive/checklist/TestCheckItem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/cognitive/checklist/TestCheckItem.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/cognitive/checklist/TestCheckItem.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/cognitive/checklist/TestCheckItem.java 2011-07-20 05:10:13-0700
@@ -86,8 +86,7 @@
item.getCategory() == category);
assertTrue("CheckItem.getPredicate() incorrect after "
+ "initialization (1)",
- item.getPredicate2() ==
- PredicateTrue.getInstance());
+ item.getPredicate2() == PredicateTrue.getInstance());
// reset the values to something different
category += "- Set Test";
Modified: trunk/src/argouml-app/tests/org/argouml/model/TestModelEventPump.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/model/TestModelEventPump.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/model/TestModelEventPump.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/model/TestModelEventPump.java 2011-07-20 05:10:13-0700
@@ -43,8 +43,6 @@
import junit.framework.TestCase;
-import org.argouml.kernel.Project;
-import org.argouml.kernel.ProjectManager;
import org.argouml.profile.ProfileFacade;
import org.argouml.profile.init.InitProfileSubsystem;
Modified: trunk/src/argouml-app/tests/org/argouml/notation/TestNotationProvider.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/TestNotationProvider.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/notation/TestNotationProvider.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/notation/TestNotationProvider.java 2011-07-20 05:10:13-0700
@@ -38,13 +38,8 @@
package org.argouml.notation;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
import junit.framework.TestCase;
-import org.argouml.kernel.Project;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.profile.init.InitProfileSubsystem;
Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java 2011-07-20 05:10:13-0700
@@ -40,7 +40,6 @@
import junit.framework.TestCase;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.notation.NotationSettings;
Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestActionStateNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestActionStateNotationUml.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestActionStateNotationUml.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestActionStateNotationUml.java 2011-07-20 05:10:13-0700
@@ -40,8 +40,6 @@
import junit.framework.TestCase;
-import org.argouml.kernel.Project;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.notation.NotationSettings;
Modified: trunk/src/argouml-app/tests/org/argouml/profile/ProfileMother.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/ProfileMother.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/profile/ProfileMother.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/profile/ProfileMother.java 2011-07-20 05:10:13-0700
@@ -125,7 +125,8 @@
public static final String TAG_DEFINITION_NAME_TD = "TagDef";
/**
- * Create a simple profile model with name {@link ProfileMother#DEFAULT_SIMPLE_PROFILE_NAME}
+ * Create a simple profile model with name
+ * {@link ProfileMother#DEFAULT_SIMPLE_PROFILE_NAME}
* with a class named "foo" and with a stereotype named
* {@link ProfileMother#STEREOTYPE_NAME_ST}.
*
@@ -149,8 +150,11 @@
// assert getFacade().getRootElements().size() == 0;
Object model = getModelManagementFactory().createProfile();
Object fooClass = Model.getCoreFactory().buildClass("foo", model);
- Object stereotype = getExtensionMechanismsFactory().buildStereotype(fooClass,
- STEREOTYPE_NAME_ST, model);
+ Object stereotype =
+ getExtensionMechanismsFactory().buildStereotype(
+ fooClass,
+ STEREOTYPE_NAME_ST,
+ model);
getCoreHelper().setName(model, profileName);
getExtensionMechanismsFactory().buildTagDefinition(
TAG_DEFINITION_NAME_TD, stereotype, null);
@@ -165,8 +169,9 @@
models);
for (Object stereotype : stereotypes) {
if (STEREOTYPE_NAME_PROFILE.equals(
- Model.getFacade().getName(stereotype)))
+ Model.getFacade().getName(stereotype))) {
return stereotype;
+ }
}
return null;
}
@@ -254,6 +259,7 @@
DependencyCreator dependencyCreator,
File profilesDir, String dependentProfileFilenamePrefix)
throws IOException, UmlException {
+
XmiReader xmiReader = Model.getXmiReader();
xmiReader.addSearchPath(profileFromWhichDependsFile.getParent());
InputSource pIs = new InputSource(
@@ -291,7 +297,8 @@
* @throws UmlException if the manipulation of models causes errors.
*/
List<File> createProfileFilePairWith2ndDependingOn1stViaXmi()
- throws IOException, UmlException {
+ throws IOException, UmlException {
+
File profilesDir = FileHelper.createTempDirectory();
final File baseFile = File.createTempFile(
"baseProfile", XMI_FILE_EXTENSION, profilesDir);
@@ -300,17 +307,21 @@
Model.getUmlFactory().deleteExtent(model);
ProfileMother.DependencyCreator dependencyCreator =
new ProfileMother.DependencyCreator() {
- public void create(Object profileFromWhichDepends,
- Object dependentProfile) {
- Object theClass = Model.getCoreFactory().buildClass("DasClazz",
- dependentProfile);
- Collection stereotypes = getFacade().getStereotypes(
- profileFromWhichDepends);
- assert stereotypes.size() >= 1: "";
- Object stereotype = stereotypes.iterator().next();
- Model.getCoreHelper().addStereotype(theClass, stereotype);
- }
- };
+ public void create(Object profileFromWhichDepends,
+ Object dependentProfile) {
+ Object theClass =
+ Model.getCoreFactory().buildClass(
+ "DasClazz",
+ dependentProfile);
+ Collection stereotypes =
+ getFacade().getStereotypes(profileFromWhichDepends);
+ assert stereotypes.size() >= 1 : "";
+ Object stereotype = stereotypes.iterator().next();
+ Model.getCoreHelper().addStereotype(
+ theClass,
+ stereotype);
+ }
+ };
String dependentProfileFilenamePrefix = "dependentProfile";
final File dependentFile = createXmiDependentProfile(
baseFile, dependencyCreator, profilesDir,
@@ -333,7 +344,8 @@
* @throws UmlException if the manipulation of models causes errors.
*/
public List<File> createUnloadedProfilePairWith2ndDependingOn1stViaXmi()
- throws IOException, UmlException {
+ throws IOException, UmlException {
+
List<File> profileFiles =
createProfileFilePairWith2ndDependingOn1stViaXmi();
File baseProfileFile = profileFiles.get(0);
@@ -363,8 +375,10 @@
* @param replacement the replacement {@link String}.
* @throws IOException if IO operations throw.
*/
- static public void replaceStringInFile(File file, String regex,
- String replacement) throws IOException {
+ public static void replaceStringInFile(File file, String regex,
+ String replacement)
+ throws IOException {
+
StringBuffer fileContents = new StringBuffer();
BufferedReader reader = null;
String fileContents2 = null;
@@ -422,7 +436,8 @@
* @throws IOException
*/
public File createUnloadedSimpleProfile(String profileName)
- throws IOException {
+ throws IOException {
+
Object model = createSimpleProfileModel(profileName);
File profileFile = File.createTempFile(profileName,
XMI_FILE_EXTENSION);
Modified: trunk/src/argouml-app/tests/org/argouml/uml/TestStereotypeUtility.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/TestStereotypeUtility.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/uml/TestStereotypeUtility.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/uml/TestStereotypeUtility.java 2011-07-20 05:10:13-0700
@@ -61,14 +61,15 @@
* Tests the scenario in which a Stereotype is already applied to a model
* element and it shouldn't be returned as an available Stereotype to be
* applied to the model element.
- * (see <a href="http://argouml.tigris.org/issues/show_bug.cgi?id=5969">issue 5969</a>).
+ * (see <a href="http://argouml.tigris.org/issues/show_bug.cgi?id=5969">
+ * issue 5969</a>).
* This test is for
* {@link StereotypeUtility#getAvailableStereotypes(Object)}.
*
* @throws Exception When something goes wrong...
*/
public void testGetAvailableStereotypesForAModelElementIssue5969()
- throws Exception {
+ throws Exception {
ProfileMother profileMother = new ProfileMother();
File profileFile = profileMother.createUnloadedSimpleProfile();
profileFile.deleteOnExit();
Modified: trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/extension_mechanisms/TestUMLTagDefinitionComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/extension_mechanisms/TestUMLTagDefinitionComboBoxModel.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/extension_mechanisms/TestUMLTagDefinitionComboBoxModel.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/uml/ui/foundation/extension_mechanisms/TestUMLTagDefinitionComboBoxModel.java 2011-07-20 05:10:13-0700
@@ -41,23 +41,22 @@
import java.io.File;
import java.util.Collection;
+import junit.framework.TestCase;
+
import org.argouml.FileHelper;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.TestProjectWithProfiles;
-import org.argouml.model.Model;
-import org.argouml.ui.targetmanager.TargetEvent;
-import org.argouml.uml.StereotypeUtility;
-import org.argouml.uml.TestStereotypeUtility;
-import org.argouml.uml.ui.foundation.extension_mechanisms.UMLTagDefinitionComboBoxModel;
-
-import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
+import org.argouml.model.Model;
import org.argouml.persistence.AbstractFilePersister;
import org.argouml.profile.ProfileFacade;
import org.argouml.profile.ProfileMother;
import org.argouml.profile.UserDefinedProfile;
import org.argouml.profile.init.InitProfileSubsystem;
+import org.argouml.ui.targetmanager.TargetEvent;
+import org.argouml.uml.StereotypeUtility;
+import org.argouml.uml.TestStereotypeUtility;
/**
* Test cases for the UMLTagDefinitionComboBoxModel class.
Modified: trunk/src/argouml-app/tests/org/argouml/util/CheckResourceBundle.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/util/CheckResourceBundle.java?view=diff&pathrev=19614&r1=19613&r2=19614
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/util/CheckResourceBundle.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/util/CheckResourceBundle.java 2011-07-20 05:10:13-0700
@@ -100,11 +100,12 @@
*/
public static void checkContainsAllFrom(ResourceBundle b,
String[] tags) {
- for (int i = 0; i < tags.length; i++)
+ for (int i = 0; i < tags.length; i++) {
Assert.assertTrue("Can't find tag \"" + tags[i]
+ "\" in "
+ b.getClass().getName(),
bundleContains(b, tags[i]));
+ }
}
/**
@@ -179,37 +180,43 @@
if (System.getProperty("user.language") != null
&& System.getProperty("user.country") != null
- && System.getProperty("user.variant") != null)
+ && System.getProperty("user.variant") != null) {
el.add(new Locale(System.getProperty("user.language"),
System.getProperty("user.country"),
System.getProperty("user.variant")));
+ }
if (System.getProperty("user.language") != null
&& System.getProperty("user.region") != null
- && System.getProperty("user.variant") != null)
+ && System.getProperty("user.variant") != null) {
el.add(new Locale(System.getProperty("user.language"),
System.getProperty("user.region"),
System.getProperty("user.variant")));
+ }
if (System.getProperty("user.language") != null
- && System.getProperty("user.country") != null)
+ && System.getProperty("user.country") != null) {
el.add(new Locale(System.getProperty("user.language"),
System.getProperty("user.country"),
""));
+ }
if (System.getProperty("user.language") != null
- && System.getProperty("user.region") != null)
+ && System.getProperty("user.region") != null) {
el.add(new Locale(System.getProperty("user.language"),
System.getProperty("user.region"),
""));
+ }
- if (System.getProperty("user.language") != null)
+ if (System.getProperty("user.language") != null) {
el.add(new Locale(System.getProperty("user.language"),
"", ""));
+ }
List<Locale> v = new ArrayList<Locale>();
for (Locale elel : el) {
for (int j = 0; j < SUPPORTEDLANGUAGES.length; j++) {
- if (SUPPORTEDLANGUAGES[j] == null)
+ if (SUPPORTEDLANGUAGES[j] == null) {
continue;
+ }
if (elel.equals(new Locale(SUPPORTEDLANGUAGES[j][0],
SUPPORTEDLANGUAGES[j][1],
SUPPORTEDLANGUAGES[j][2]))) {
@@ -219,8 +226,9 @@
}
}
for (int j = 0; j < SUPPORTEDLANGUAGES.length; j++) {
- if (SUPPORTEDLANGUAGES[j] == null)
+ if (SUPPORTEDLANGUAGES[j] == null) {
continue;
+ }
v.add(new Locale(SUPPORTEDLANGUAGES[j][0],
SUPPORTEDLANGUAGES[j][1],
SUPPORTEDLANGUAGES[j][2]));
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2798850
To unsubscribe from this discussion, e-mail: [[email protected]].