Author: tfmorris
Date: 2007-05-26 15:50:28-0700
New Revision: 12676
Modified:
trunk/src_new/org/argouml/application/events/ArgoEventPump.java
trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java
trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java
trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src_new/org/argouml/uml/reveng/Import.java
trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java
trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java
Log:
Style cleanups - imports & indentation
Modified: trunk/src_new/org/argouml/application/events/ArgoEventPump.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/events/ArgoEventPump.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/application/events/ArgoEventPump.java&p2=trunk/src_new/org/argouml/application/events/ArgoEventPump.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/application/events/ArgoEventPump.java (original)
+++ trunk/src_new/org/argouml/application/events/ArgoEventPump.java 2007-05-26 15:50:28-0700
@@ -252,11 +252,11 @@
}
if (event.getEventType() >= ArgoEventTypes.ANY_HELP_EVENT
&& event.getEventType() < ArgoEventTypes.LAST_HELP_EVENT) {
- if (listener instanceof ArgoHelpEventListener) {
- handleFireHelpEvent((ArgoHelpEvent) event,
- (ArgoHelpEventListener) listener);
- }
+ if (listener instanceof ArgoHelpEventListener) {
+ handleFireHelpEvent((ArgoHelpEvent) event,
+ (ArgoHelpEventListener) listener);
}
+ }
if (event.getEventType() >= ArgoEventTypes.ANY_GENERATOR_EVENT
&& event.getEventType() < ArgoEventTypes.LAST_GENERATOR_EVENT) {
if (listener instanceof ArgoGeneratorEventListener) {
Modified: trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java&p2=trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java (original)
+++ trunk/src_new/org/argouml/ui/targetmanager/TargetManager.java 2007-05-26 15:50:28-0700
@@ -34,7 +34,6 @@
import java.util.List;
import java.util.ListIterator;
-import javax.swing.Action;
import javax.swing.event.EventListenerList;
import org.apache.log4j.Logger;
Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java 2007-05-26 15:50:28-0700
@@ -86,7 +86,7 @@
*/
protected int getNotationProviderType() {
return NotationProviderFactory2.TYPE_OBJECT;
- }
+ }
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/StateDiagramRenderer.java 2007-05-26 15:50:28-0700
@@ -129,8 +129,8 @@
}
}
if (figNode == null) {
- LOG.debug("TODO: StateDiagramRenderer getFigNodeFor");
- return null;
+ LOG.debug("TODO: StateDiagramRenderer getFigNodeFor");
+ return null;
}
lay.add(figNode);
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java 2007-05-26 15:50:28-0700
@@ -817,10 +817,10 @@
// TODO: In my view the Fig representing the model element should be
// removed from the diagram. Yet to be agreed. Bob.
if (LOG.isInfoEnabled() && mee.getNewValue() == null) {
- LOG.info(Model.getFacade().getName(mee.getOldValue()) +
- " has been removed from the namespace of " +
- Model.getFacade().getName(getOwner()) +
- " by notice of " + mee.toString());
+ LOG.info(Model.getFacade().getName(mee.getOldValue())
+ + " has been removed from the namespace of "
+ + Model.getFacade().getName(getOwner())
+ + " by notice of " + mee.toString());
}
LayerPerspective layer = (LayerPerspective) getLayer();
Fig f = layer.presentationFor(mee.getOldValue());
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2007-05-26 15:50:28-0700
@@ -88,7 +88,6 @@
import org.tigris.gef.base.Layer;
import org.tigris.gef.base.LayerPerspective;
import org.tigris.gef.base.Selection;
-import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.graph.MutableGraphSupport;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigGroup;
Modified: trunk/src_new/org/argouml/uml/reveng/Import.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/Import.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/uml/reveng/Import.java&p2=trunk/src_new/org/argouml/uml/reveng/Import.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/Import.java (original)
+++ trunk/src_new/org/argouml/uml/reveng/Import.java 2007-05-26 15:50:28-0700
@@ -340,7 +340,7 @@
} else if ("1".equals(detaillevel)) {
classAndFeatures.setSelected(true);
} else {
- fullImport.setSelected(true);
+ fullImport.setSelected(true);
}
detailButtonGroup.add(fullImport);
Modified: trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java 2007-05-26 15:50:28-0700
@@ -146,11 +146,11 @@
Object obj = box.getTarget();
if (Model.getFacade().isAClassifierInState(obj)) {
try {
- oldClassifier = Model.getFacade().getType(obj);
- } catch (InvalidElementException e1) {
- /* No problem - this ClassifierInState was just erased. */
- return;
- }
+ oldClassifier = Model.getFacade().getType(obj);
+ } catch (InvalidElementException e1) {
+ /* No problem - this ClassifierInState was just erased. */
+ return;
+ }
cis = obj;
}
Object cl = box.getSelectedItem();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelObjectFlowState.java 2007-05-26 15:50:28-0700
@@ -467,7 +467,7 @@
protected Vector getSelected() {
Object t = getTarget();
if (Model.getFacade().isAObjectFlowState(t)) {
- return new Vector(Model.getFacade().getParameters(t));
+ return new Vector(Model.getFacade().getParameters(t));
}
return new Vector();
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java 2007-05-26 15:50:28-0700
@@ -43,11 +43,11 @@
private JScrollPane stimuliReceiverScroll;
- private static UMLInstanceSenderStimulusListModel
- stimuliSenderListModel = new UMLInstanceSenderStimulusListModel();
+ private static UMLInstanceSenderStimulusListModel stimuliSenderListModel
+ = new UMLInstanceSenderStimulusListModel();
private static UMLInstanceReceiverStimulusListModel
- stimuliReceiverListModel = new UMLInstanceReceiverStimulusListModel();
+ stimuliReceiverListModel = new UMLInstanceReceiverStimulusListModel();
/**
* The constructor.
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java 2007-05-26 15:50:28-0700
@@ -55,8 +55,8 @@
private JTextField languageTextField;
private UMLComboBox2 specificationComboBox;
- private static UMLMethodSpecificationComboBoxModel
- specificationComboBoxModel;
+ private static UMLMethodSpecificationComboBoxModel
+ specificationComboBoxModel;
private UMLModelElementLanguageDocument languageDocument =
new UMLModelElementLanguageDocument();
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java?view=diff&rev=12676&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java&r1=12675&r2=12676
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java 2007-05-26 15:50:28-0700
@@ -80,14 +80,14 @@
new UMLModelElementNamespaceListModel();
private static UMLModelElementClientDependencyListModel
- clientDependencyListModel =
+ clientDependencyListModel =
new UMLModelElementClientDependencyListModel();
private static UMLModelElementConstraintListModel constraintListModel =
new UMLModelElementConstraintListModel();
private static UMLModelElementElementResidenceListModel
- elementResidenceListModel =
+ elementResidenceListModel =
new UMLModelElementElementResidenceListModel();
private static UMLModelElementNameDocument nameDocument =
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.