Author: tfmorris
Date: 2007-11-19 17:08:14-0800
New Revision: 13794
Modified:
trunk/src_new/org/argouml/i18n/label.properties
trunk/src_new/org/argouml/ui/DetailsPane.java
trunk/src_new/org/argouml/uml/diagram/ui/PropPanelDiagram.java
trunk/src_new/org/argouml/uml/ui/PropPanel.java
trunk/src_new/org/argouml/uml/ui/TabProps.java
trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java
trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActivityGraph.java
trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.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/activity_graphs/PropPanelPartition.java
trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelSubactivityState.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelClassifierRole.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelMessage.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelAction.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelActionSequence.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelArgument.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelComponentInstance.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCreateAction.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelDestroyAction.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelException.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelInstance.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLinkEnd.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelNodeInstance.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelObject.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReception.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReturnAction.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSendAction.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSignal.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelTerminateAction.java
trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelUninterpretedAction.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelChangeEvent.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelFinalState.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSignalEvent.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSynchState.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTimeEvent.java
trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java
trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelActor.java
trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java
trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtensionPoint.java
trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java
trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAbstraction.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClass.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComment.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComponent.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelConstraint.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDataType.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDependency.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelElementResidence.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumeration.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumerationLiteral.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFeature.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFlow.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelGeneralization.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelInterface.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNode.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelOperation.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelParameter.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelUsage.java
trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelStereotype.java
trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java
trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java
trunk/src_new/org/argouml/uml/ui/model_management/PropPanelElementImport.java
trunk/src_new/org/argouml/uml/ui/model_management/PropPanelModel.java
trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java
trunk/src_new/org/argouml/uml/ui/model_management/PropPanelSubsystem.java
Log:
Remove dependency on ConfigLoader for remembering orientation
Add localized titles for proppanels missing them
Modified: trunk/src_new/org/argouml/i18n/label.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/i18n/label.properties?view=diff&rev=13794&p1=trunk/src_new/org/argouml/i18n/label.properties&p2=trunk/src_new/org/argouml/i18n/label.properties&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/i18n/label.properties (original)
+++ trunk/src_new/org/argouml/i18n/label.properties 2007-11-19 17:08:14-0800
@@ -27,9 +27,12 @@
label.abstract = Abstract
label.abstraction = Abstraction
label.action = Action
+label.action-state = ActionState
label.actions = Actions
+label.action-sequence = ActionSequence
label.activator = Activator:
label.activity-diagram = Activity Diagram
+label.activity-graph-title = ActivityGraph
label.activity-graph = ActivityGraph:
label.actor = Actor
label.addition = Included Use Case:
@@ -41,13 +44,16 @@
label.annotated-elements = Annotated Elements:
label.applied-stereotypes = Applied Stereotypes
label.argouml.version = Last Saved with ArgoUML:
+label.argument = Argument
label.arguments = Arguments:
label.association = Association:
label.association-class = AssociationClass
label.association-end = AssociationEnd
label.association-ends = Association Ends:
+label.association-end-role = AssociationEndRole
label.association-link-end = AssociationEnd
label.association-links = Links:
+label.association-role-title = Association Role
label.association-role = Association Role:
label.association-role-ends = AssociationRole Ends:
label.association-roles = Association Roles:
@@ -69,9 +75,11 @@
label.bound = Bound:
label.bounds = Bounds
label.by = , by
+label.call-action = Call Action
label.call-event = Call Event
+label.call-state = CallState
label.change = Change Expression
-label.change.event=Change event
+label.change.event=Change Event
label.changeability = Changeability:
label.changeability-addonly = addOnly
label.changeability-changeable = changeable
@@ -82,6 +90,7 @@
label.class-diagram = Class Diagram
label.class.navigate.tooltip = Go to selected classifier
label.classifier = Classifier:
+label.classifier-in-state = ClassifierInState
label.classifierinstate.navigate.tooltip = Go to selected classifier or classifierInState
label.classifier-role = ClassifierRole
label.classifiers = Classifiers:
@@ -93,6 +102,7 @@
label.comment.body = Body:
label.comment.name = Comment Name:
label.component = Component
+label.component-instance = Component Instance
label.components = Components:
label.composite-state=Composite State
label.concurrency = Concurrency:
@@ -106,6 +116,7 @@
label.connections = Connections:
label.constrained-elements = Constrained Elements:
label.constraining-elements = Constraining Elements:
+label.constraint = Constraint
label.constraint.body = Body:
label.constraints = Constraints:
label.constraints-pane = Constraints Pane
@@ -115,8 +126,10 @@
label.context.navigate.tooltip = Go to selected Context
label.contexts = Contexts:
label.country = Country:
+label.create-action = CreateAction
label.custom = Custom
label.data-values = Data Value:
+label.data-type = DataType
label.decision = Decision
label.decision-priority = Priority
label.default-profile = UML Profile File
@@ -130,6 +143,7 @@
label.deprecated = Deprecated:
label.deprecated-p = <Deprecated>
label.derived = Derived:
+label.destroy-action = DestroyAction
label.diagramappearance.fontlist = Name
label.diagramappearance.fontsize = Size
label.diagramappearance.preview = The quick brown fox jumps over the lazy dog
@@ -149,12 +163,17 @@
label.documentation-pane = Documentation Pane
label.edem = Report Usage Statistics
label.effect = Effect:
+label.element-import = Element Import
+label.element-residence = ElementResidence
label.email = Email Address:
label.enter-rationale-here = <Enter Rationale Here>
label.enter-todo-item = <Enter TODO Item here>
label.entry = Entry Action:
label.enumeration = Enumeration:
+label.enumeration-literal = Enumeration Literal
+label.enumeration-title = Enumeration
label.error-sax-factory = Error determining SAX Parser Factory\n
+label.exception = Exception
label.exit = Exit Action:
label.expression = Expression:
label.extend = Extend
@@ -168,6 +187,7 @@
label.features = Features:
label.fill = Fill
label.final.state=Final State
+label.flow = Flow
label.fonts.big = Big size
label.fonts.huge = Huge size
label.fonts.normal = Normal size
@@ -185,30 +205,37 @@
label.import.empty = No files imported.
label.imported-elements = Imported Elements:
label.imported-element = Imported Element:
+label.include = Include
label.includes = Includes:
label.incoming = Incoming:
label.initial-value = Initial Value:
+label.instance = Instance
label.instantiation = Instantiation:
label.instate = In State:
label.interaction = Interaction:
+label.interaction-title = Interaction
+label.interface = Interface
label.internal-transitions = Internal transitions:
label.language = Language:
label.language.tooltip = Language
label.leaf = Leaf
label.line = Line
label.linkends = Linkends:
+label.link = Link
label.links = Links:
label.literals = Literals:
label.location = Location:
label.look-and-feel = Look and Feel:
label.low = Low
label.medium = Medium
+label.message = Message
label.messages = Messages:
label.metal-theme = Metal Theme:
label.method = Method:
label.methods = Methods:
label.model = Model
label.modelelement = ModelElement:
+label.model-element-title = ModelElement
label.modelelement.navigate.tooltip = Go to selected ModelElement
label.modifiers = Modifiers:
label.more-info-url = More Info URL:
@@ -223,7 +250,11 @@
label.no-shadow = No Shadow
label.no-version = -- No version information available --\n Perhaps manifest \
isn't available or you aren't using JAR.\n
+label.node = Node
+label.node-instance = Node Instance
label.notation-language = Notation Language:
+label.object = Object
+label.object-flow-state = ObjectFlowState
label.off = Off
label.offenders = Offenders:
label.open-project-status-read = Read {0}.
@@ -241,6 +272,7 @@
label.owner.navigate.tooltip = Go to selected stereotype
label.owning-use-case = Owning Use Case:
label.package = Package
+label.parameter = Parameter
label.parameter.default-value = Default Value:
label.parameter.kind = Direction Kind:
label.parameter-direction-in = in
@@ -249,8 +281,10 @@
label.parameter-direction-return = return
label.parameters = Parameters:
label.parent = Parent:
-label.perspectives = Perspectives
+label.partition-title = Swimlane
label.partition = Partition:
+label.permission = Permission
+label.perspectives = Perspectives
label.powertype = Powertype:
label.predecessor = Predecessors:
label.preload = Preload Common Classes
@@ -272,10 +306,12 @@
label.query = Query
label.raisedsignals = Raised Signals:
label.receiver = Receiver:
+label.reception = Reception
label.receptions = Receptions:
label.recurrence = Recurrence:
label.referencestate = Reference State:
label.reference-values = Reference Value:
+label.relationship = Relationship
label.reload-recent = Reload last project on startup
label.remove-item = This item should be removed because
label.represented-classifier = Represented Classifier:
@@ -286,6 +322,7 @@
label.residents = Residents:
label.resident = Resident:
label.restart-application = Restart the application to see these changes.
+label.return-action = ReturnAction
label.root = Root
label.rules-library = Rules Library
label.save-project-status-writing = Writing {0}...
@@ -297,6 +334,7 @@
label.see-p = <See>
label.selected = Selected:
label.selected-rules = Selected Rules
+label.send-action = SendAction
label.sender = Sender:
label.sequence-diagram = Sequence Diagram
label.shadow = Shadow
@@ -311,6 +349,7 @@
label.show-stereotypes = Show stereotypes in explorer
label.show-types = Show types and parameters
label.show-visibility = Show visibility
+label.signal-title = Signal
label.signal = Signal:
label.signal.event=Signal event
label.simple.state=Simple State
@@ -330,10 +369,12 @@
label.state-chart-diagram = Statechart Diagram
label.statemachine = Statemachine:
label.static = Static
+label.stereotype-title = Stereotype
label.stereotype = Stereotype:
label.stereotype.navigate.tooltip = Go to selected stereotype
label.stimili-received = Stimuli received:
label.stimili-sent = Stimuli sent:
+label.stimulus = Stimulus
label.strip-diagrams = Strip (non-standard) diagrams from XMI file during import
label.stub.state=Stub State
label.style-pane = Style Pane
@@ -347,14 +388,18 @@
label.stylepane.no-shadow = No Shadow
label.stylepane.path = Path
label.stylepane.rounding = Rounding
+label.subactivity-state = SubactivityState
label.submachine = Submachine:
label.submachinestate = Submachine State:
+label.subsystem = Subsystem
label.subvertex = Subvertices:
label.supplier-dependencies = Supplier Dependencies:
label.suppliers = Suppliers:
label.synch-state = Synch State:
+label.tag-definition-title = Tag Definition
label.tagdefinition = Tag definition:
label.tagdefinitions = Tag definitions:
+label.tagged-value = Tagged Value
label.tagged-values = Tagged Values:
label.tagged-values-pane = Tagged Values Pane
label.taggedvaluespane.tag = Tag
@@ -362,6 +407,7 @@
label.target = Target
label.target-flows = Target Flows:
label.targetscope-classifier = static
+label.terminate-action = TerminateAction
label.text = Text:
label.time.event=Time event
label.todo-pane = ToDo Pane
@@ -369,12 +415,15 @@
label.todopane.items = {0} Items
label.todopane.no-items = No Items
label.top-state = Top:
+label.transition-title = Transition
label.transition = Transition:
label.transitions = Transitions:
label.trigger = Trigger:
label.type = Type:
label.type.navigate.tooltip = Go to selected type
label.typed-values = Typed Values:
+label.uninterpreted-action = UninterpretedAction
+label.usage = Usage
label.use-guillemots = Use guillemots
label.usecase = Use Case
label.usecase-base = Base Use Case:
Modified: trunk/src_new/org/argouml/ui/DetailsPane.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/DetailsPane.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/ui/DetailsPane.java&p2=trunk/src_new/org/argouml/ui/DetailsPane.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/ui/DetailsPane.java (original)
+++ trunk/src_new/org/argouml/ui/DetailsPane.java 2007-11-19 17:08:14-0800
@@ -98,15 +98,15 @@
TabProps.class,
TabDocumentation.class,
TabStyle.class,
- // TabDocs
+ // TabDocs,
TabSrc.class,
- // TabJavaSrc | TabSrc
+ // TabJavaSrc | TabSrc,
TabConstraints.class,
TabStereotype.class,
TabTaggedValues.class,
org.argouml.cognitive.checklist.ui.TabChecklist.class,
- // TabHistory
- // TabHash
+ // TabHistory,
+ // TabHash,
};
/**
@@ -118,15 +118,15 @@
// new TabProps(),
// new TabDocumentation(),
// new TabStyle(),
-// // TabDocs
+// // TabDocs,
// new TabSrc(),
-// // TabJavaSrc | TabSrc
+// // TabJavaSrc | TabSrc,
// new TabConstraints(),
// new TabStereotype(),
// new TabTaggedValues(),
// new org.argouml.cognitive.checklist.ui.TabChecklist(),
-// // TabHistory
-// // TabHash
+// // TabHistory,
+// // TabHash,
// };
/**
@@ -158,6 +158,8 @@
* time.
*/
private EventListenerList listenerList = new EventListenerList();
+
+ private Orientation orientation;
/**
* Adds a listener.
@@ -186,13 +188,17 @@
* @param compassPoint the position for which to build the pane
* @param orientation is the orientation.
*/
- public DetailsPane(String compassPoint, Orientation orientation) {
+ public DetailsPane(String compassPoint, Orientation theOrientation) {
LOG.info("making DetailsPane(" + compassPoint + ")");
+
+ orientation = theOrientation;
// TODO: Instantiate our required tabs directly instead of using
// reflection in ConfigLoader.
ConfigLoader.loadTabs(tabPanelList, compassPoint, orientation);
+ setOrientation(orientation);
+
setLayout(new BorderLayout());
setFont(new Font("Dialog", Font.PLAIN, 10));
add(topLevelTabbedPane, BorderLayout.CENTER);
@@ -450,12 +456,9 @@
* @return the property panel
*/
public TabProps getTabProps() {
- Iterator iter = tabPanelList.iterator();
- Object o;
- while (iter.hasNext()) {
- o = iter.next();
- if (o instanceof TabProps) {
- return (TabProps) o;
+ for (JPanel tab : tabPanelList) {
+ if (tab instanceof TabProps) {
+ return (TabProps) tab;
}
}
return null;
@@ -467,13 +470,11 @@
* @param tabClass the given class
* @return the tab instance for the given class
*/
- public AbstractArgoJPanel getTab(Class tabClass) {
- Iterator iter = tabPanelList.iterator();
- Object o;
- while (iter.hasNext()) {
- o = iter.next();
- if (o.getClass().equals(tabClass)) {
- return (AbstractArgoJPanel) o;
+ public AbstractArgoJPanel getTab(
+ Class<? extends AbstractArgoJPanel> tabClass) {
+ for (JPanel tab : tabPanelList) {
+ if (tab.getClass().equals(tabClass)) {
+ return (AbstractArgoJPanel) tab;
}
}
return null;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/PropPanelDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/PropPanelDiagram.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/diagram/ui/PropPanelDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/PropPanelDiagram.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/PropPanelDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/PropPanelDiagram.java 2007-11-19 17:08:14-0800
@@ -40,7 +40,6 @@
import org.argouml.uml.ui.AbstractActionNavigate;
import org.argouml.uml.ui.ActionDeleteModelElements;
import org.argouml.uml.ui.PropPanel;
-import org.argouml.util.ConfigLoader;
/**
* This class represents the properties panel for a Diagram.
@@ -49,13 +48,13 @@
public class PropPanelDiagram extends PropPanel {
/**
- * Constructs a proppanel with a given name.
+ * Construct a property panel with a given name and icon.
*
* @param diagramName the diagram name to use as the title of the panel
* @param icon an icon to display on the panel
*/
protected PropPanelDiagram(String diagramName, ImageIcon icon) {
- super(diagramName, icon, ConfigLoader.getTabPropsOrientation());
+ super(diagramName, icon);
JTextField field = new JTextField();
field.getDocument().addDocumentListener(new DiagramNameDocument(field));
@@ -76,8 +75,7 @@
this("Diagram", null);
}
-
-} /* end class PropPanelDiagram */
+}
class ActionNavigateUpFromDiagram extends AbstractActionNavigate {
@@ -101,6 +99,7 @@
/*
* @see javax.swing.Action#isEnabled()
*/
+ @Override
public boolean isEnabled() {
return true;
}
@@ -108,6 +107,7 @@
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getTarget();
Object destination = navigateTo(target);
Modified: trunk/src_new/org/argouml/uml/ui/PropPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/PropPanel.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/PropPanel.java&p2=trunk/src_new/org/argouml/uml/ui/PropPanel.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/PropPanel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/PropPanel.java 2007-11-19 17:08:14-0800
@@ -64,6 +64,7 @@
import org.argouml.uml.profile.ProfileConfiguration;
import org.tigris.gef.presentation.Fig;
import org.tigris.swidgets.GridLayout2;
+import org.tigris.swidgets.Horizontal;
import org.tigris.swidgets.LabelledLayout;
import org.tigris.swidgets.Orientation;
import org.tigris.swidgets.Vertical;
@@ -120,15 +121,16 @@
LookAndFeelMgr.getInstance().getStandardFont();
/**
- * Construct new PropPanel using LabelledLayout.<p>
- *
- * @param icon
- * The icon to display for the panel
- * @param label
- * The label for the title of the panel (to be localized).
- * @param orientation
- * the orientation
+ * Construct new PropPanel using LabelledLayout.
+ * <p>
+ * @param icon The icon to display for the panel
+ * @param label The label for the title of the panel (to be localized).
+ * @param orientation the orientation
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanel(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanel(String label, ImageIcon icon, Orientation orientation) {
super(Translator.localize(label));
setOrientation(orientation);
@@ -153,21 +155,42 @@
/**
* Constructs a new Proppanel without an icon. If there is an icon it's
- * updated at runtime via settarget.<p>
+ * updated at runtime via settarget.
+ * <p>
+ * @param label The label for the title of the PropPanel (to be localized).
+ * @param orientation the orientation
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanel(String, ImageIcon)} and
+ * setOrientation() after instantiation.
+ */
+ @Deprecated
+ public PropPanel(String label, Orientation orientation) {
+ this(label, (ImageIcon) null, orientation);
+ }
+
+ /**
+ * Constructs a new Proppanel with default orientation.<p>
*
* @param label
* The label for the title of the PropPanel (to be localized).
- * @param orientation
- * the orientation
+ * @param icon icon to use for panel
*/
- public PropPanel(String label, Orientation orientation) {
- this(label, null, orientation);
+ public PropPanel(String label, ImageIcon icon) {
+ this(label, icon, Horizontal.getInstance());
}
/*
* @see org.tigris.swidgets.Orientable#setOrientation(org.tigris.swidgets.Orientation)
*/
+ @Override
public void setOrientation(Orientation orientation) {
+ // TODO: Do we need to change the layout manager when
+ // changing orientation to match the behavior of the constructor?
+// if (getOrientation() != orientation) {
+// LabelledLayout layout = new LabelledLayout(orientation == Vertical
+// .getInstance());
+// setLayout(layout);
+// }
super.setOrientation(orientation);
}
Modified: trunk/src_new/org/argouml/uml/ui/TabProps.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabProps.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/TabProps.java&p2=trunk/src_new/org/argouml/uml/ui/TabProps.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabProps.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabProps.java 2007-11-19 17:08:14-0800
@@ -111,6 +111,7 @@
import org.argouml.uml.ui.foundation.core.PropPanelClass;
import org.argouml.uml.ui.foundation.core.PropPanelComment;
import org.argouml.uml.ui.foundation.core.PropPanelComponent;
+import org.argouml.uml.ui.foundation.core.PropPanelConstraint;
import org.argouml.uml.ui.foundation.core.PropPanelDataType;
import org.argouml.uml.ui.foundation.core.PropPanelDependency;
import org.argouml.uml.ui.foundation.core.PropPanelElementResidence;
@@ -132,10 +133,10 @@
import org.argouml.uml.ui.model_management.PropPanelModel;
import org.argouml.uml.ui.model_management.PropPanelPackage;
import org.argouml.uml.ui.model_management.PropPanelSubsystem;
-import org.argouml.util.ConfigLoader;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigText;
+import org.tigris.swidgets.Horizontal;
import org.tigris.swidgets.Orientable;
import org.tigris.swidgets.Orientation;
@@ -158,11 +159,10 @@
* Logger.
*/
private static final Logger LOG = Logger.getLogger(TabProps.class);
- ////////////////////////////////////////////////////////////////
- // instance variables
+
private boolean shouldBeEnabled = false;
private JPanel blankPanel = new JPanel();
- private Hashtable panels = new Hashtable();
+ private Hashtable<Class, TabModelTarget> panels = new Hashtable<Class, TabModelTarget>();
private JPanel lastPanel;
private String panelClassBaseName = "";
@@ -192,7 +192,7 @@
public TabProps(String tabName, String panelClassBase) {
super(tabName);
TargetManager.getInstance().addTargetListener(this);
- setOrientation(ConfigLoader.getTabPropsOrientation());
+ setOrientation(Horizontal.getInstance());
panelClassBaseName = panelClassBase;
setLayout(new BorderLayout());
}
@@ -204,6 +204,7 @@
*
* @see org.tigris.swidgets.Orientable#setOrientation(org.tigris.swidgets.Orientation)
*/
+ @Override
public void setOrientation(Orientation orientation) {
super.setOrientation(orientation);
Enumeration pps = panels.elements();
@@ -302,8 +303,10 @@
* @return the tab panel
*/
private TabModelTarget findPanelFor(Object trgt) {
+ // TODO: No test coverage for this or createPropPanel? - tfm
+
/* 1st attempt: get a panel that we created before: */
- TabModelTarget p = (TabModelTarget) panels.get(trgt.getClass());
+ TabModelTarget p = panels.get(trgt.getClass());
if (p != null) {
if (LOG.isDebugEnabled()) {
LOG.debug("Getting prop panel for: " + trgt.getClass().getName()
@@ -341,6 +344,8 @@
TabModelTarget propPanel = null;
+
+
// Create prop panels for diagrams
if (modelElement instanceof UMLActivityDiagram) {
propPanel = new PropPanelUMLActivityDiagram();
@@ -356,7 +361,11 @@
propPanel = new PropPanelUMLStateDiagram();
} else if (modelElement instanceof UMLUseCaseDiagram) {
propPanel = new PropPanelUMLUseCaseDiagram();
- } else if (Model.getFacade().isASubmachineState(modelElement)) {
+ }
+ // TODO: This needs to be in type hierarchy order to work properly
+ // and create the most specific property panel properly
+
+ else if (Model.getFacade().isASubmachineState(modelElement)) {
propPanel = new PropPanelSubmachineState();
} else if (Model.getFacade().isASubactivityState(modelElement)) {
propPanel = new PropPanelSubactivityState();
@@ -404,6 +413,8 @@
propPanel = new PropPanelComponentInstance();
} else if (Model.getFacade().isACompositeState(modelElement)) {
propPanel = new PropPanelCompositeState();
+ } else if (Model.getFacade().isAConstraint(modelElement)) {
+ propPanel = new PropPanelConstraint();
} else if (Model.getFacade().isACreateAction(modelElement)) {
propPanel = new PropPanelCreateAction();
} else if (Model.getFacade().isAEnumeration(modelElement)) {
@@ -517,8 +528,13 @@
} else if (modelElement instanceof FigText) {
propPanel = new PropPanelString();
}
-
+
+ if (propPanel instanceof Orientable) {
+ ((Orientable) propPanel).setOrientation(getOrientation());
+ }
+
if (propPanel instanceof PropPanel) {
+ ((PropPanel) propPanel).setOrientation(getOrientation());
((PropPanel) propPanel).buildToolbar();
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActionState.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -27,9 +27,8 @@
import javax.swing.ImageIcon;
import org.argouml.i18n.Translator;
-import org.tigris.swidgets.Orientation;
import org.argouml.uml.ui.behavior.state_machines.AbstractPropPanelState;
-import org.argouml.util.ConfigLoader;
+import org.tigris.swidgets.Orientation;
/**
* User interface panel shown at the bottom of the screen that allows the user
@@ -46,8 +45,7 @@
* Construct a default property panel for an Action State.
*/
public PropPanelActionState() {
- this("Action State", lookupIcon("ActionState"),
- ConfigLoader.getTabPropsOrientation());
+ this("label.action-state", lookupIcon("ActionState"));
}
/**
@@ -56,29 +54,38 @@
* @param name the name of the properties panel
* @param icon the icon to be shown next to the name
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelActionState(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelActionState(String name, ImageIcon icon,
Orientation orientation) {
+ this(name, icon);
+ setOrientation(orientation);
+ }
+
+ /**
+ * Construct a property panel for an Action State with the given params.
+ *
+ * @param name the name of the properties panel
+ * @param icon the icon to be shown next to the name
+ */
+ public PropPanelActionState(String name, ImageIcon icon) {
+ super(name, icon);
- super(name, icon, orientation);
-
- addField(Translator.localize("label.name"),
- getNameTextField());
- addField(Translator.localize("label.container"),
- getContainerScroll());
- addField(Translator.localize("label.entry"),
- getEntryScroll());
+ addField(Translator.localize("label.name"), getNameTextField());
+ addField(Translator.localize("label.container"), getContainerScroll());
+ addField(Translator.localize("label.entry"), getEntryScroll());
addField(Translator.localize("label.deferrable"),
getDeferrableEventsScroll());
addSeparator();
- addField(Translator.localize("label.incoming"),
- getIncomingScroll());
- addField(Translator.localize("label.outgoing"),
- getOutgoingScroll());
+ addField(Translator.localize("label.incoming"), getIncomingScroll());
+ addField(Translator.localize("label.outgoing"), getOutgoingScroll());
}
-} /* end class PropPanelActionState */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActivityGraph.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActivityGraph.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActivityGraph.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActivityGraph.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActivityGraph.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelActivityGraph.java 2007-11-19 17:08:14-0800
@@ -33,7 +33,6 @@
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.UMLModelElementListModel2;
import org.argouml.uml.ui.behavior.state_machines.PropPanelStateMachine;
-import org.argouml.util.ConfigLoader;
/**
* PropertyPanel for Activitygraphs. It inherits almost everything from
@@ -45,9 +44,10 @@
* The constructor.
*/
public PropPanelActivityGraph() {
- super("ActivityGraph", ConfigLoader.getTabPropsOrientation());
+ super("label.activity-graph-title", lookupIcon("ActivityGraph"));
}
+ @Override
protected UMLComboBoxModel2 getContextComboBoxModel() {
return new UMLActivityGraphContextComboBoxModel();
}
@@ -55,6 +55,7 @@
/**
* @see org.argouml.uml.ui.behavior.state_machines.PropPanelStateMachine#initialize()
*/
+ @Override
protected void initialize() {
super.initialize();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelCallState.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2003-2006 The Regents of the University of California. All
+// Copyright (c) 2003-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -34,7 +34,6 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.behavior.state_machines.AbstractPropPanelState;
import org.argouml.uml.ui.behavior.state_machines.UMLStateEntryListModel;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
@@ -52,19 +51,32 @@
*
*/
public PropPanelCallState() {
- this("CallState", lookupIcon("CallState"), ConfigLoader
- .getTabPropsOrientation());
+ this("label.call-state", lookupIcon("CallState"));
}
/**
* @param name the name of the properties panel
* @param icon the icon to be shown next to the name
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelCallState(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelCallState(String name, ImageIcon icon,
Orientation orientation) {
+ this(name, icon);
+ setOrientation(orientation);
+ }
+
+ /**
+ * @param name the name of the properties panel
+ * @param icon the icon to be shown next to the name
+ * @param orientation the orientation of the panel
+ */
+ public PropPanelCallState(String name, ImageIcon icon) {
- super(name, icon, orientation);
+ super(name, icon);
callActionEntryList =
new UMLCallStateEntryList(
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=13794&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=13793&r2=13794
==============================================================================
--- 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-11-19 17:08:14-0800
@@ -49,7 +49,6 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.UMLSearchableComboBox;
import org.argouml.uml.ui.foundation.core.PropPanelClassifier;
-import org.argouml.util.ConfigLoader;
import org.tigris.gef.undo.UndoableAction;
/**
@@ -74,8 +73,7 @@
* Construct a property panel for a ClassifierInState.
*/
public PropPanelClassifierInState() {
- super("ClassifierInState", lookupIcon("ClassifierInState"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.classifier-in-state", lookupIcon("ClassifierInState"));
addField(Translator.localize("label.name"),
getNameTextField());
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=13794&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=13793&r2=13794
==============================================================================
--- 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-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2003-2006 The Regents of the University of California. All
+// Copyright (c) 2003-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -48,7 +48,6 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.UMLSearchableComboBox;
import org.argouml.uml.ui.behavior.state_machines.AbstractPropPanelState;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for an ObjectFlowState.
@@ -70,13 +69,10 @@
* Construct a property panel for ObjectFlowState elements.
*/
public PropPanelObjectFlowState() {
- super("ObjectFlowState", lookupIcon("ObjectFlowState"), ConfigLoader
- .getTabPropsOrientation());
+ super("label.object-flow-state", lookupIcon("ObjectFlowState"));
- addField(Translator.localize("label.name"),
- getNameTextField());
- addField(Translator.localize("label.container"),
- getContainerScroll());
+ addField(Translator.localize("label.name"), getNameTextField());
+ addField(Translator.localize("label.container"), getContainerScroll());
addField(Translator.localize("label.synch-state"),
new UMLActionSynchCheckBox());
@@ -121,6 +117,7 @@
/*
* @see org.argouml.uml.ui.behavior.state_machines.AbstractPropPanelState#addExtraButtons()
*/
+ @Override
protected void addExtraButtons() {
/* We do not want the Internal Transitions button here. */
@@ -135,6 +132,7 @@
/*
* @see org.argouml.uml.ui.PropPanel#setTarget(java.lang.Object)
*/
+ @Override
public void setTarget(Object t) {
Object oldTarget = getTarget();
super.setTarget(t);
@@ -341,6 +339,7 @@
/*
* @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
Object state = getObjectToRemove();
@@ -479,6 +478,7 @@
super();
}
+ @Override
public void actionPerformed(ActionEvent e) {
Object target = getTarget();
if (Model.getFacade().isAObjectFlowState(target)) {
@@ -503,6 +503,7 @@
/*
* @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
Object param = getObjectToRemove();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelPartition.java 2007-11-19 17:08:14-0800
@@ -39,7 +39,6 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
@@ -59,8 +58,7 @@
* constructor.
*/
public PropPanelPartition() {
- super("Swimlane", lookupIcon("Partition"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.partition-title", lookupIcon("Partition"));
addField(Translator.localize("label.name"), getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelSubactivityState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelSubactivityState.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelSubactivityState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelSubactivityState.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelSubactivityState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/activity_graphs/PropPanelSubactivityState.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2003-2006 The Regents of the University of California. All
+// Copyright (c) 2003-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -25,7 +25,6 @@
package org.argouml.uml.ui.behavior.activity_graphs;
import org.argouml.uml.ui.behavior.state_machines.PropPanelSubmachineState;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for the SubactivityState.
@@ -39,7 +38,6 @@
* Constructor
*/
public PropPanelSubactivityState() {
- super("SubactivityState", lookupIcon("SubactivityState"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.subactivity-state", lookupIcon("SubactivityState"));
}
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationEndRole.java 2007-11-19 17:08:14-0800
@@ -26,7 +26,6 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.foundation.core.PropPanelAssociationEnd;
-import org.argouml.util.ConfigLoader;
/**
* The property panel for an AssociationEnd.
@@ -34,10 +33,10 @@
public class PropPanelAssociationEndRole extends PropPanelAssociationEnd {
/**
- * Constructs the proppanel and places all scrollpanes etc. on the canvas.
+ * Construct the proppanel and place all scrollpanes etc. on the canvas.
*/
public PropPanelAssociationEndRole() {
- super("AssociationEndRole", ConfigLoader.getTabPropsOrientation());
+ super("label.association-end-role", lookupIcon("AssociationEndRole"));
setAssociationLabel(Translator.localize("label.association-role"));
createControls();
positionStandardControls();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java 2007-11-19 17:08:14-0800
@@ -35,7 +35,6 @@
import org.argouml.uml.ui.UMLComboBoxNavigator;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelAssociation;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for an AssociationRole.
@@ -51,11 +50,9 @@
* Construct a property panel for an AssociationRole.
*/
public PropPanelAssociationRole() {
- // TODO: I18N
- super("Association Role", ConfigLoader.getTabPropsOrientation());
+ super("label.association-role-title");
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
getNamespaceSelector());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelClassifierRole.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelClassifierRole.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelClassifierRole.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelClassifierRole.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelClassifierRole.java 2007-11-19 17:08:14-0800
@@ -35,7 +35,6 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelClassifier;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* TODO: this property panel needs refactoring to remove dependency on
@@ -57,10 +56,9 @@
* Construct a property panel for a ClassifierRole.
*/
public PropPanelClassifierRole() {
- super("ClassifierRole", ConfigLoader.getTabPropsOrientation());
+ super("label.classifier-role", lookupIcon("ClassifierRole"));
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
getNamespaceSelector());
@@ -77,7 +75,6 @@
addField(Translator.localize("label.base"),
new JScrollPane(baseList));
-
addSeparator();
addField(Translator.localize("label.generalizations"),
@@ -120,4 +117,4 @@
}
-} /* end class PropPanelClassifierRole */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelCollaboration.java 2007-11-19 17:08:14-0800
@@ -33,7 +33,6 @@
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelNamespace;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* Property panel for collaborations.
@@ -51,10 +50,9 @@
* Construct a property panel for a Collaboration.
*/
public PropPanelCollaboration() {
- super("Collaboration", ConfigLoader.getTabPropsOrientation());
+ super("label.collaboration", lookupIcon("Collaboration"));
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
getNamespaceSelector());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelInteraction.java 2007-11-19 17:08:14-0800
@@ -50,7 +50,7 @@
* Construct a property panel for an Interaction.
*/
public PropPanelInteraction() {
- super("Interaction", ConfigLoader.getTabPropsOrientation());
+ super("label.interaction-title", lookupIcon("Interaction"));
addField(Translator.localize("label.name"),
getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelMessage.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelMessage.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelMessage.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelMessage.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelMessage.java 2007-11-19 17:08:14-0800
@@ -40,7 +40,6 @@
import org.argouml.uml.ui.UMLSingleRowSelector;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* Properties panel for a Message.
@@ -51,7 +50,7 @@
* Construct a new property panel for a Message.
*/
public PropPanelMessage() {
- super("Message", ConfigLoader.getTabPropsOrientation());
+ super("label.message", lookupIcon("Message"));
addField(Translator.localize("label.name"),
getNameTextField());
@@ -106,6 +105,7 @@
* @see java.awt.event.ActionListener#actionPerformed(
* java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
if (Model.getFacade().isAMessage(target)) {
@@ -124,4 +124,4 @@
* The UID.
*/
private static final long serialVersionUID = -8433911715875762175L;
-} /* end class PropPanelMessage */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelAction.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelAction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelAction.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelAction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelAction.java 2007-11-19 17:08:14-0800
@@ -46,7 +46,6 @@
import org.argouml.uml.ui.UMLScriptExpressionModel;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* An abstract representatation of the properties panel of an Action.
@@ -62,7 +61,7 @@
* Construct a default property panel for an Action.
*/
public PropPanelAction() {
- this("Action", null);
+ this("label.action", null);
}
/**
@@ -74,7 +73,7 @@
* the icon to be shown next to the name
*/
public PropPanelAction(String name, ImageIcon icon) {
- super(name, icon, ConfigLoader.getTabPropsOrientation());
+ super(name, icon);
initialize();
}
@@ -155,6 +154,7 @@
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
Object t = TargetManager.getInstance().getTarget();
if (Model.getFacade().isAAction(t)) {
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelActionSequence.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelActionSequence.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelActionSequence.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelActionSequence.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelActionSequence.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelActionSequence.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -42,7 +42,6 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* Properties panel of an ActionSequence.
@@ -55,7 +54,7 @@
* Construct a default property panel for an Action.
*/
public PropPanelActionSequence() {
- this("ActionSequence", lookupIcon("ActionSequence"));
+ this("label.action-sequence", lookupIcon("ActionSequence"));
}
/**
@@ -67,7 +66,7 @@
* the icon to be shown next to the name
*/
public PropPanelActionSequence(String name, ImageIcon icon) {
- super(name, icon, ConfigLoader.getTabPropsOrientation());
+ super(name, icon);
initialize();
}
@@ -183,6 +182,7 @@
/*
* @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
Object action = getObjectToRemove();
@@ -209,6 +209,7 @@
/*
* @see org.argouml.uml.ui.UMLMutableLinkedList#getPopupMenu()
*/
+ @Override
public JPopupMenu getPopupMenu() {
return new PopupMenuNewAction(ActionNewAction.Roles.MEMBER, this);
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelArgument.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelArgument.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelArgument.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelArgument.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelArgument.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelArgument.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2003-2006 The Regents of the University of California. All
+// Copyright (c) 2003-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -35,7 +35,6 @@
import org.argouml.uml.ui.UMLExpressionLanguageField;
import org.argouml.uml.ui.UMLExpressionModel2;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
-import org.argouml.util.ConfigLoader;
/**
*
@@ -45,14 +44,11 @@
*/
public class PropPanelArgument extends PropPanelModelElement {
- // //////////////////////////////////////////////////////////////
- // contructors
/**
* Constructor.
*/
public PropPanelArgument() {
-
- super("Argument", ConfigLoader.getTabPropsOrientation());
+ super("label.argument", lookupIcon("Argument"));
addField(Translator.localize("label.name"), getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -46,16 +46,16 @@
public class PropPanelCallAction extends PropPanelAction {
/**
- * The constructor.
- *
+ * Construct a property panel for a CallAction element.
*/
public PropPanelCallAction() {
- super("CallAction", lookupIcon("CallAction"));
+ super("label.call-action", lookupIcon("CallAction"));
}
/*
* @see org.argouml.uml.ui.behavior.common_behavior.PropPanelAction#initialize()
*/
+ @Override
public void initialize() {
super.initialize();
@@ -215,6 +215,7 @@
*
* @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt instanceof AttributeChangeEvent) {
if (evt.getPropertyName().equals("operation")) {
@@ -237,4 +238,4 @@
* The UID.
*/
private static final long serialVersionUID = 6998109319912301992L;
-} /* end class PropPanelCallAction */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelComponentInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelComponentInstance.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelComponentInstance.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelComponentInstance.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelComponentInstance.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelComponentInstance.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -35,7 +35,6 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.foundation.core.UMLContainerResidentListModel;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a ComponentInstance.
@@ -48,11 +47,10 @@
private static final long serialVersionUID = 7178149693694151459L;
/**
- * Contructor.
+ * Construct a property panel for a ComponentInstance.
*/
public PropPanelComponentInstance() {
- super("Component Instance", lookupIcon("ComponentInstance"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.component-instance", lookupIcon("ComponentInstance"));
addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
@@ -86,4 +84,4 @@
addAction(getDeleteAction());
}
-} /* end class PropPanelComponentInstance */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCreateAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCreateAction.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCreateAction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCreateAction.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCreateAction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelCreateAction.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -31,8 +31,10 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
/**
- * The properties panel for a CreateAction. TODO: this property panel needs
- * refactoring to remove dependency on old gui components.
+ * The properties panel for a CreateAction.
+ * <p>
+ * TODO: this property panel needs refactoring to remove dependency on old gui
+ * components.
*/
public class PropPanelCreateAction extends PropPanelAction {
@@ -40,7 +42,7 @@
* The constructor.
*/
public PropPanelCreateAction() {
- super("CreateAction", lookupIcon("CreateAction"));
+ super("label.create-action", lookupIcon("CreateAction"));
AbstractActionAddModelElement action =
new ActionAddCreateActionInstantiation();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelDestroyAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelDestroyAction.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelDestroyAction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelDestroyAction.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelDestroyAction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelDestroyAction.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -27,7 +27,7 @@
/**
* The properties panel for a DestroyAction.
- *
+ * <p>
* TODO: this property panel needs refactoring to remove dependency on
* old gui components.
*/
@@ -38,7 +38,7 @@
*
*/
public PropPanelDestroyAction() {
- super("DestroyAction", lookupIcon("DestroyAction"));
+ super("label.destroy-action", lookupIcon("DestroyAction"));
}
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelException.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelException.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelException.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelException.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelException.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelException.java 2007-11-19 17:08:14-0800
@@ -39,7 +39,7 @@
* Construct the property panel.
*/
public PropPanelException() {
- super("Exception", "Exception");
+ super("label.exception", "Exception");
}
}
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=13794&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=13793&r2=13794
==============================================================================
--- 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-11-19 17:08:14-0800
@@ -48,12 +48,28 @@
stimuliReceiverListModel = new UMLInstanceReceiverStimulusListModel();
/**
- * The constructor.
- *
+ * Construct a property panel for an Instance with the given name, icon and
+ * orientation.
+ *
+ * @param name the name for the properties panel
+ * @param icon the icon shown next to the name
+ */
+ public PropPanelInstance(String name, ImageIcon icon) {
+ super(name, icon);
+ }
+
+ /**
+ * Construct a property panel for an Instance with the given name, icon and
+ * orientation.
+ *
* @param name the name for the properties panel
* @param icon the icon shown next to the name
* @param orientation the orientation
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelInstance(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelInstance(String name, ImageIcon icon,
Orientation orientation) {
super(name, icon, orientation);
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -46,7 +46,6 @@
import org.argouml.uml.ui.UMLSearchableComboBox;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
import org.tigris.gef.undo.UndoableAction;
/**
@@ -60,12 +59,10 @@
new UMLLinkAssociationComboBoxModel();
/**
- * The constructor.
- *
+ * Construct a property panel for a Link element.
*/
public PropPanelLink() {
- super("Link", lookupIcon("Link"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.link", lookupIcon("Link"));
addField(Translator.localize("label.name"),
getNameTextField());
@@ -184,6 +181,7 @@
/*
* @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
/*
* Rebuild the list from scratch to be sure it's correct.
@@ -221,6 +219,7 @@
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
Object source = e.getSource();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLinkEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLinkEnd.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLinkEnd.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLinkEnd.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLinkEnd.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelLinkEnd.java 2007-11-19 17:08:14-0800
@@ -34,7 +34,6 @@
import org.argouml.uml.ui.AbstractActionNavigate;
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
-import org.argouml.util.ConfigLoader;
/**
* A basic property panel for link ends.
@@ -55,11 +54,8 @@
* Construct a property panel for a Link End.
*/
public PropPanelLinkEnd() {
- super("label.association-link-end",
- lookupIcon("AssociationEnd"),
- ConfigLoader.getTabPropsOrientation());
- addField("label.name",
- getNameTextField());
+ super("label.association-link-end", lookupIcon("AssociationEnd"));
+ addField("label.name", getNameTextField());
addSeparator();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelNodeInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelNodeInstance.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelNodeInstance.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelNodeInstance.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelNodeInstance.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelNodeInstance.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -35,11 +35,10 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.foundation.core.UMLContainerResidentListModel;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel of a NodeInstance.
- *
+ * <p>
* TODO: this property panel needs refactoring to remove dependency on old gui
* components.
*/
@@ -54,8 +53,7 @@
* Construct a property panel for Node Instance elements.
*/
public PropPanelNodeInstance() {
- super("Node Instance", lookupIcon("NodeInstance"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.node-instance", lookupIcon("NodeInstance"));
addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelObject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelObject.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelObject.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelObject.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelObject.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelObject.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -32,7 +32,6 @@
import org.argouml.uml.ui.ActionNavigateNamespace;
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
@@ -44,8 +43,7 @@
* Construct a property panel for UML Object elements.
*/
public PropPanelObject() {
- super("Object", lookupIcon("Object"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.object", lookupIcon("Object"));
addField(Translator.localize("label.name"), getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReception.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReception.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReception.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReception.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReception.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReception.java 2007-11-19 17:08:14-0800
@@ -38,7 +38,6 @@
import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementLeafCheckBox;
import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementRootCheckBox;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* PropertyPanel for a Reception.
@@ -56,8 +55,7 @@
* Construct a property panel for a Reception.
*/
public PropPanelReception() {
- super("Reception", lookupIcon("Reception"), ConfigLoader
- .getTabPropsOrientation());
+ super("label.reception", lookupIcon("Reception"));
addField(Translator.localize("label.name"),
getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReturnAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReturnAction.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReturnAction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReturnAction.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReturnAction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelReturnAction.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -27,7 +27,7 @@
/**
* The properties panel for a ReturnAction.
- *
+ * <p>
* TODO: this property panel needs refactoring to remove dependency on
* old gui components.
*/
@@ -38,7 +38,7 @@
*
*/
public PropPanelReturnAction() {
- super("ReturnAction", lookupIcon("ReturnAction"));
+ super("label.return-action", lookupIcon("ReturnAction"));
}
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSendAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSendAction.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSendAction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSendAction.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSendAction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSendAction.java 2007-11-19 17:08:14-0800
@@ -46,7 +46,7 @@
* The constructor.
*/
public PropPanelSendAction() {
- super("SendAction", lookupIcon("SendAction"));
+ super("label.send-action", lookupIcon("SendAction"));
AbstractActionAddModelElement action =
new ActionAddSendActionSignal();
@@ -64,6 +64,7 @@
/**
* @see org.argouml.uml.ui.behavior.common_behavior.PropPanelAction#addExtraActions()
*/
+ @Override
protected void addExtraActions() {
addAction(new ActionNewSignal());
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSignal.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSignal.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSignal.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSignal.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSignal.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelSignal.java 2007-11-19 17:08:14-0800
@@ -40,7 +40,6 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelClassifier;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel of a Signal.
@@ -61,7 +60,7 @@
* Construct a default property panel for a Signal.
*/
public PropPanelSignal() {
- this("Signal", "SignalSending");
+ this("label.signal-title", "SignalSending");
}
/**
@@ -75,8 +74,7 @@
* name of the image icon to use
*/
public PropPanelSignal(String title, String iconName) {
- super(title, lookupIcon(iconName),
- ConfigLoader.getTabPropsOrientation());
+ super(title, lookupIcon(iconName));
addField(Translator.localize("label.name"),
getNameTextField());
@@ -251,6 +249,7 @@
/*
* @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
Object context = getObjectToRemove();
@@ -286,6 +285,7 @@
/*
* @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
Object reception = getObjectToRemove();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelStimulus.java 2007-11-19 17:08:14-0800
@@ -31,7 +31,6 @@
import org.argouml.uml.ui.UMLStimulusActionTextProperty;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a Stimulus.
@@ -49,8 +48,7 @@
* Construct a new property panel for a Stimulus.
*/
public PropPanelStimulus() {
- super("Stimulus Properties", lookupIcon("Stimulus"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.stimulus", lookupIcon("Stimulus"));
addField(Translator.localize("label.name"),
getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelTerminateAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelTerminateAction.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelTerminateAction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelTerminateAction.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelTerminateAction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelTerminateAction.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -27,7 +27,7 @@
/**
* The properties panel for a TerminateAction.
- *
+ * <p>
* TODO: this property panel needs refactoring to remove dependency on
* old gui components.
*/
@@ -38,7 +38,7 @@
*
*/
public PropPanelTerminateAction() {
- super("TerminateAction", lookupIcon("TerminateAction"));
+ super("label.terminate-action", lookupIcon("TerminateAction"));
}
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelUninterpretedAction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelUninterpretedAction.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelUninterpretedAction.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelUninterpretedAction.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelUninterpretedAction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/common_behavior/PropPanelUninterpretedAction.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -26,7 +26,7 @@
/**
* The properties panel for a UninterpretedAction.
- *
+ * <p>
* TODO: this property panel needs refactoring to remove dependency on
* old gui components.
*/
@@ -37,7 +37,7 @@
*
*/
public PropPanelUninterpretedAction() {
- super("UninterpretedAction", lookupIcon("UninterpretedAction"));
+ super("label.uninterpreted-action", lookupIcon("UninterpretedAction"));
}
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/AbstractPropPanelState.java 2007-11-19 17:08:14-0800
@@ -48,17 +48,32 @@
private JScrollPane deferrableEventsScroll;
-
/**
* Constructor for AbstractPropPanelState.
* @param name the name of the properties panel, to be shown at the top
* @param icon the icon to be shown next to the name
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #AbstractPropPanelState(String, ImageIcon)} and
+ * setOrientation() after instantiation.
+ */
+ @Deprecated
+ public AbstractPropPanelState(String name, ImageIcon icon,
+ Orientation orientation) {
+ this(name, icon);
+ setOrientation(orientation);
+ }
+
+ /**
+ * Construct a property panel for a State. Since State is abstract, this
+ * will never be instantiated directly, but rather as part of the
+ * instantiation of one of its concrete subclasses.
+ *
+ * @param name the name of the properties panel, to be shown at the top
+ * @param icon the icon to be shown next to the name
*/
- public AbstractPropPanelState(
- String name, ImageIcon icon, Orientation orientation)
- {
- super(name, icon, orientation);
+ public AbstractPropPanelState(String name, ImageIcon icon) {
+ super(name, icon);
JList deferrableList = new UMLStateDeferrableEventList(
new UMLStateDeferrableEventListModel());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCallEvent.java 2007-11-19 17:08:14-0800
@@ -37,7 +37,6 @@
import org.argouml.uml.ui.UMLComboBoxNavigator;
import org.argouml.uml.ui.UMLSearchableComboBox;
import org.argouml.uml.ui.foundation.core.ActionNewParameter;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel of a CallEvent.
@@ -47,17 +46,16 @@
public class PropPanelCallEvent extends PropPanelEvent {
/**
- * The constructor.
- *
+ * Construct a property panel for a Call Event.
*/
public PropPanelCallEvent() {
- super("label.call-event", lookupIcon("CallEvent"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.call-event", lookupIcon("CallEvent"));
}
/*
* @see org.argouml.uml.ui.behavior.state_machines.PropPanelEvent#initialize()
*/
+ @Override
public void initialize() {
super.initialize();
@@ -89,6 +87,7 @@
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
Object source = e.getSource();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelChangeEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelChangeEvent.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelChangeEvent.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelChangeEvent.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelChangeEvent.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelChangeEvent.java 2007-11-19 17:08:14-0800
@@ -30,7 +30,6 @@
import org.argouml.uml.ui.UMLExpressionBodyField;
import org.argouml.uml.ui.UMLExpressionLanguageField;
import org.argouml.uml.ui.UMLExpressionModel2;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a ChangeEvent.
@@ -40,17 +39,16 @@
public class PropPanelChangeEvent extends PropPanelEvent {
/**
- * The constructor.
- *
+ * Construct a property panel for a Change Event.
*/
public PropPanelChangeEvent() {
- super("label.change.event", lookupIcon("ChangeEvent"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.change.event", lookupIcon("ChangeEvent"));
}
/*
* @see org.argouml.uml.ui.behavior.state_machines.PropPanelEvent#initialize()
*/
+ @Override
public void initialize() {
super.initialize();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelCompositeState.java 2007-11-19 17:08:14-0800
@@ -34,7 +34,6 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ui.ActionAddConcurrentRegion;
import org.argouml.uml.diagram.ui.ActionDeleteConcurrentRegion;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
@@ -58,41 +57,50 @@
* @param name the name of the properties panel
* @param icon the icon to be shown next to the name
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelCompositeState(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelCompositeState(final String name, final ImageIcon icon,
final Orientation orientation) {
- super(name, icon, orientation);
+ super(name, icon);
+ setOrientation(orientation);
initialize();
}
/**
+ * Constructor for PropPanelCompositeState.
+ * @param name the name of the properties panel
+ * @param icon the icon to be shown next to the name
+ */
+ public PropPanelCompositeState(final String name, final ImageIcon icon) {
+ super(name, icon);
+ initialize();
+ }
+
+ /**
* Construct a new property panel for a CompositeState.
*
*/
public PropPanelCompositeState() {
- super("label.composite-state", lookupIcon("CompositeState"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.composite-state", lookupIcon("CompositeState"));
initialize();
- addField("label.name",
- getNameTextField());
- addField("label.container",
- getContainerScroll());
- /*addField("label.modifiers",
- new UMLCompositeStateConcurrentCheckBox());*/
- addField("label.entry",
- getEntryScroll());
- addField("label.exit",
- getExitScroll());
- addField("label.do-activity",
- getDoScroll());
+ addField("label.name", getNameTextField());
+ addField("label.container", getContainerScroll());
+ /*
+ * addField("label.modifiers", new
+ * UMLCompositeStateConcurrentCheckBox());
+ */
+ addField("label.entry", getEntryScroll());
+ addField("label.exit", getExitScroll());
+ addField("label.do-activity", getDoScroll());
addSeparator();
- addField("label.incoming",
- getIncomingScroll());
- addField("label.outgoing",
- getOutgoingScroll());
+ addField("label.incoming", getIncomingScroll());
+ addField("label.outgoing", getOutgoingScroll());
addField("label.internal-transitions",
getInternalTransitionsScroll());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelEvent.java 2007-11-19 17:08:14-0800
@@ -49,11 +49,14 @@
/**
* Constructor for PropPanelEvent.
- *
+ *
* @param name the name string of the properties panel
* @param icon the icon to be shown next to the name
* @param orientation the orientation
+ * @deprecated for 0.25.4 by tfmorris. Use constructor without Orientation
+ * argument and use setOrientation after instantiation.
*/
+ @Deprecated
public PropPanelEvent(String name, ImageIcon icon,
Orientation orientation) {
super(name, icon, orientation);
@@ -61,20 +64,28 @@
}
/**
+ * Construct a property panel for an Event.
+ *
+ * @param name the name string of the properties panel
+ * @param icon the icon to be shown next to the name
+ */
+ public PropPanelEvent(String name, ImageIcon icon) {
+ super(name, icon);
+ initialize();
+ }
+
+ /**
* Initialize the panel with all fields and stuff.
*/
protected void initialize() {
paramScroll = getParameterScroll();
- addField("label.name",
- getNameTextField());
- addField("label.namespace",
- getNamespaceSelector());
+ addField("label.name", getNameTextField());
+ addField("label.namespace", getNamespaceSelector());
addSeparator();
- addField("label.parameters",
- getParameterScroll());
+ addField("label.parameters", getParameterScroll());
JList transitionList = new UMLLinkedList(
new UMLEventTransitionListModel());
transitionList.setVisibleRowCount(2);
@@ -102,4 +113,4 @@
return paramScroll;
}
-} /* end class PropPanelEvent */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelFinalState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelFinalState.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelFinalState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelFinalState.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelFinalState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelFinalState.java 2007-11-19 17:08:14-0800
@@ -24,7 +24,6 @@
package org.argouml.uml.ui.behavior.state_machines;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a FinalState.
@@ -42,28 +41,21 @@
* Construct a new property panel for a Final State.
*/
public PropPanelFinalState() {
- super("label.final.state", lookupIcon("FinalState"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.final.state", lookupIcon("FinalState"));
- addField("label.name",
- getNameTextField());
- addField("label.container",
- getContainerScroll());
- addField("label.entry",
- getEntryScroll());
- addField("label.do-activity",
- getDoScroll());
+ addField("label.name", getNameTextField());
+ addField("label.container", getContainerScroll());
+ addField("label.entry", getEntryScroll());
+ addField("label.do-activity", getDoScroll());
addSeparator();
- addField("label.incoming",
- getIncomingScroll());
- addField("label.internal-transitions",
- getInternalTransitionsScroll());
+ addField("label.incoming", getIncomingScroll());
+ addField("label.internal-transitions", getInternalTransitionsScroll());
}
-} /* end class PropPanelFinalState */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelGuard.java 2007-11-19 17:08:14-0800
@@ -36,7 +36,6 @@
import org.argouml.uml.ui.UMLExpressionModel2;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* A property panel for Guards.
@@ -56,7 +55,7 @@
*
*/
public PropPanelGuard() {
- super("label.guard", ConfigLoader.getTabPropsOrientation());
+ super("label.guard", lookupIcon("Guard"));
addField("label.name", getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelPseudostate.java 2007-11-19 17:08:14-0800
@@ -31,7 +31,6 @@
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
-import org.argouml.util.ConfigLoader;
/**
* Property Panel for the collection of pseudostates (branch, fork, ...). It
@@ -48,19 +47,15 @@
* Construct a new property panel for a PseudoState (branch, fork, etc).
*/
public PropPanelPseudostate() {
- super("label.pseudostate", null, ConfigLoader.getTabPropsOrientation());
+ super("label.pseudostate", lookupIcon("State"));
- addField("label.name",
- getNameTextField());
- addField("label.container",
- getContainerScroll());
+ addField("label.name", getNameTextField());
+ addField("label.container", getContainerScroll());
addSeparator();
- addField("label.incoming",
- getIncomingScroll());
- addField("label.outgoing",
- getOutgoingScroll());
+ addField("label.incoming", getIncomingScroll());
+ addField("label.outgoing", getOutgoingScroll());
TargetManager.getInstance().addTargetListener(this);
}
@@ -122,6 +117,7 @@
/*
* @see org.argouml.uml.ui.PropPanel#targetAdded(org.argouml.ui.targetmanager.TargetEvent)
*/
+ @Override
public void targetAdded(TargetEvent e) {
if (Model.getFacade().isAPseudostate(e.getNewTarget())) {
refreshTarget();
@@ -132,6 +128,7 @@
/*
* @see org.argouml.uml.ui.PropPanel#targetRemoved(org.argouml.ui.targetmanager.TargetEvent)
*/
+ @Override
public void targetRemoved(TargetEvent e) {
if (Model.getFacade().isAPseudostate(e.getNewTarget())) {
refreshTarget();
@@ -142,6 +139,7 @@
/*
* @see org.argouml.uml.ui.PropPanel#targetSet(org.argouml.ui.targetmanager.TargetEvent)
*/
+ @Override
public void targetSet(TargetEvent e) {
if (Model.getFacade().isAPseudostate(e.getNewTarget())) {
refreshTarget();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSignalEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSignalEvent.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSignalEvent.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSignalEvent.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSignalEvent.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSignalEvent.java 2007-11-19 17:08:14-0800
@@ -28,28 +28,25 @@
import javax.swing.JScrollPane;
import org.argouml.uml.ui.foundation.core.ActionNewParameter;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a SignalEvent.
*
- *
* @author oliver.heyden
*/
public class PropPanelSignalEvent extends PropPanelEvent {
/**
- * The constructor.
- *
+ * Construct a property panel for a Signal Event.
*/
public PropPanelSignalEvent() {
- super("label.signal.event", lookupIcon("SignalEvent"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.signal.event", lookupIcon("SignalEvent"));
}
/*
* @see org.argouml.uml.ui.behavior.state_machines.PropPanelEvent#initialize()
*/
+ @Override
public void initialize() {
super.initialize();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSimpleState.java 2007-11-19 17:08:14-0800
@@ -26,7 +26,6 @@
import javax.swing.ImageIcon;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
@@ -45,8 +44,7 @@
* Construct a new default property panel for a Simple State.
*/
public PropPanelSimpleState() {
- this("label.simple.state", lookupIcon("SimpleState"),
- ConfigLoader.getTabPropsOrientation());
+ this("label.simple.state", lookupIcon("SimpleState"));
}
/**
@@ -56,34 +54,41 @@
* @param name the name of the properties panel, shown at the top
* @param icon the icon shown at the top
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelSimpleState(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelSimpleState(String name, ImageIcon icon,
Orientation orientation) {
- super(name, icon, orientation);
+ this(name, icon);
+ setOrientation(orientation);
+ }
+
+ /**
+ * Construct a new property panel for a Simple State with the given
+ * attributes.
+ *
+ * @param name the name of the properties panel, shown at the top
+ * @param icon the icon shown at the top
+ */
+ private PropPanelSimpleState(String name, ImageIcon icon) {
+ super(name, icon);
- addField("label.name",
- getNameTextField());
- addField("label.container",
- getContainerScroll());
- addField("label.entry",
- getEntryScroll());
- addField("label.exit",
- getExitScroll());
- addField("label.do-activity",
- getDoScroll());
- addField("label.deferrable",
- getDeferrableEventsScroll());
+ addField("label.name", getNameTextField());
+ addField("label.container", getContainerScroll());
+ addField("label.entry", getEntryScroll());
+ addField("label.exit", getExitScroll());
+ addField("label.do-activity", getDoScroll());
+ addField("label.deferrable", getDeferrableEventsScroll());
addSeparator();
- addField("label.incoming",
- getIncomingScroll());
- addField("label.outgoing",
- getOutgoingScroll());
- addField("label.internal-transitions",
- getInternalTransitionsScroll());
+ addField("label.incoming", getIncomingScroll());
+ addField("label.outgoing", getOutgoingScroll());
+ addField("label.internal-transitions", getInternalTransitionsScroll());
}
-} /* end class PropPanelSimpleState */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateMachine.java 2007-11-19 17:08:14-0800
@@ -24,6 +24,7 @@
package org.argouml.uml.ui.behavior.state_machines;
+import javax.swing.ImageIcon;
import javax.swing.JList;
import javax.swing.JScrollPane;
@@ -35,7 +36,6 @@
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
@@ -55,18 +55,32 @@
* Constructor for PropPanelStateMachine.
*/
public PropPanelStateMachine() {
- this("label.statemachine", ConfigLoader.getTabPropsOrientation());
-
+ this("label.statemachine", lookupIcon("StateMachine"));
}
/**
* The constructor.
*
* @param name the title of the properties panel, to be shown at the top
+ */
+ public PropPanelStateMachine(String name, ImageIcon icon) {
+ super(name, icon);
+ initialize();
+ }
+
+ /**
+ * The constructor.
+ *
+ * @param name the title of the properties panel, to be shown at the top
* @param orient the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelStateMachine(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelStateMachine(String name, Orientation orient) {
- super(name, lookupIcon(name), orient);
+ super(name, lookupIcon(name));
+ setOrientation(orient);
initialize();
}
@@ -74,8 +88,7 @@
* Initialize the panel with fields and stuff.
*/
protected void initialize() {
- addField("label.name",
- getNameTextField());
+ addField("label.name", getNameTextField());
addField("label.namespace",
getNamespaceSelector());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStateVertex.java 2007-11-19 17:08:14-0800
@@ -53,10 +53,25 @@
* @param name the name of the tabpanel shown at the top
* @param icon the icon of the tabpanel shown at the top
* @param orientation the orientation
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelStateVertex(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelStateVertex(String name, ImageIcon icon,
Orientation orientation) {
- super(name, icon, orientation);
+ this(name, icon);
+ setOrientation(orientation);
+ }
+
+ /**
+ * Constructor for PropPanelStateVertex.
+ *
+ * @param name the name of the tabpanel shown at the top
+ * @param icon the icon of the tabpanel shown at the top
+ */
+ public PropPanelStateVertex(String name, ImageIcon icon) {
+ super(name, icon);
JList incomingList = new UMLLinkedList(
new UMLStateVertexIncomingListModel());
incomingScroll = new JScrollPane(incomingList);
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelStubState.java 2007-11-19 17:08:14-0800
@@ -29,7 +29,6 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.UMLComboBox2;
import org.argouml.uml.ui.UMLComboBoxNavigator;
-import org.argouml.util.ConfigLoader;
/**
* @since Dec 15, 2002
@@ -46,14 +45,10 @@
* Constructor for PropPanelStubState.
*/
public PropPanelStubState() {
- super("label.stub.state", lookupIcon("StubState"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.stub.state", lookupIcon("StubState"));
- addField("label.name",
- getNameTextField());
-
- addField("label.container",
- getContainerScroll());
+ addField("label.name", getNameTextField());
+ addField("label.container", getContainerScroll());
JComboBox referencestateBox =
new UMLComboBox2(
@@ -66,10 +61,8 @@
addSeparator();
- addField("label.incoming",
- getIncomingScroll());
-
- addField("label.outgoing",
- getOutgoingScroll());
+ addField("label.incoming", getIncomingScroll());
+ addField("label.outgoing", getOutgoingScroll());
}
+
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSubmachineState.java 2007-11-19 17:08:14-0800
@@ -32,7 +32,6 @@
import org.argouml.uml.ui.UMLComboBox2;
import org.argouml.uml.ui.UMLComboBoxNavigator;
import org.argouml.uml.ui.UMLMutableLinkedList;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
@@ -56,44 +55,58 @@
* the icon to be shown next to the name
* @param orientation
* the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelCompositeState(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelSubmachineState(final String name, final ImageIcon icon,
final Orientation orientation) {
- super(name, icon, orientation);
+ super(name, icon);
+ setOrientation(orientation);
initialize();
}
/**
+ * Construct a property panel for SubmachineState elements with the given
+ * params.
+ *
+ * @param name
+ * the name of the properties panel
+ * @param icon
+ * the icon to be shown next to the name
+ */
+ public PropPanelSubmachineState(final String name, final ImageIcon icon) {
+ super(name, icon);
+ // TODO: Are these constructors organized correctly? We aren't
+ // providing our own initialize(), so all the work done in the default
+ // constructor will be skipped for
+ // our subclasses (PropPanelSubactivityState) - tfm - 20071119
+ initialize();
+ }
+
+ /**
* Construct a default property panel SubmachineState elements.
*/
public PropPanelSubmachineState() {
- super("label.submachinestate", lookupIcon("SubmachineState"),
- ConfigLoader.getTabPropsOrientation());
- addField("label.name",
- getNameTextField());
- addField("label.container",
- getContainerScroll());
+ super("label.submachinestate", lookupIcon("SubmachineState"));
+ addField("label.name", getNameTextField());
+ addField("label.container", getContainerScroll());
final JComboBox submachineBox = new UMLComboBox2(
new UMLSubmachineStateComboBoxModel(),
ActionSetSubmachineStateSubmachine.getInstance());
addField("label.submachine",
new UMLComboBoxNavigator(Translator.localize(
"tooltip.nav-submachine"), submachineBox));
- addField("label.entry",
- getEntryScroll());
- addField("label.exit",
- getExitScroll());
- addField("label.do-activity",
- getDoScroll());
+ addField("label.entry", getEntryScroll());
+ addField("label.exit", getExitScroll());
+ addField("label.do-activity", getDoScroll());
addSeparator();
- addField("label.incoming",
- getIncomingScroll());
- addField("label.outgoing",
- getOutgoingScroll());
- addField("label.internal-transitions",
- getInternalTransitionsScroll());
+ addField("label.incoming", getIncomingScroll());
+ addField("label.outgoing", getOutgoingScroll());
+ addField("label.internal-transitions", getInternalTransitionsScroll());
addSeparator();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSynchState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSynchState.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSynchState.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSynchState.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSynchState.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelSynchState.java 2007-11-19 17:08:14-0800
@@ -25,7 +25,6 @@
package org.argouml.uml.ui.behavior.state_machines;
import org.argouml.uml.ui.UMLTextField2;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a SynchState.
@@ -43,23 +42,17 @@
* Construct a property panel for a Synch State.
*/
public PropPanelSynchState() {
- super("label.synch-state",
- lookupIcon("SynchState"),
- ConfigLoader.getTabPropsOrientation());
-
- addField("label.name",
- getNameTextField());
- addField("label.container",
- getContainerScroll());
+ super("label.synch-state", lookupIcon("SynchState"));
+
+ addField("label.name", getNameTextField());
+ addField("label.container", getContainerScroll());
addField("label.bound",
new UMLTextField2(new UMLSynchStateBoundDocument()));
addSeparator();
- addField("label.incoming",
- getIncomingScroll());
- addField("label.outgoing",
- getOutgoingScroll());
+ addField("label.incoming", getIncomingScroll());
+ addField("label.outgoing", getOutgoingScroll());
}
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTimeEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTimeEvent.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTimeEvent.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTimeEvent.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTimeEvent.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTimeEvent.java 2007-11-19 17:08:14-0800
@@ -31,7 +31,6 @@
import org.argouml.uml.ui.UMLExpressionLanguageField;
import org.argouml.uml.ui.UMLExpressionModel2;
import org.argouml.uml.ui.UMLTimeExpressionModel;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a TimeEvent.
@@ -44,13 +43,13 @@
* The constructor.
*/
public PropPanelTimeEvent() {
- super("label.time.event", lookupIcon("TimeEvent"), ConfigLoader
- .getTabPropsOrientation());
+ super("label.time.event", lookupIcon("TimeEvent"));
}
/*
* @see org.argouml.uml.ui.behavior.state_machines.PropPanelEvent#initialize()
*/
+ @Override
public void initialize() {
super.initialize();
Modified: trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/state_machines/PropPanelTransition.java 2007-11-19 17:08:14-0800
@@ -42,7 +42,6 @@
import org.argouml.uml.ui.behavior.common_behavior.ActionNewUninterpretedAction;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
import org.argouml.util.ToolBarUtility;
/**
@@ -61,9 +60,7 @@
* Construct a new property panel for a Transition.
*/
public PropPanelTransition() {
- super("label.transition",
- lookupIcon("Transition"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.transition-title", lookupIcon("Transition"));
addField("label.name",
getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelActor.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelActor.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelActor.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelActor.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelActor.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelActor.java 2007-11-19 17:08:14-0800
@@ -27,7 +27,6 @@
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.foundation.core.PropPanelClassifier;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
@@ -47,28 +46,21 @@
* Construct a new property panel for an Actor.
*/
public PropPanelActor() {
- super("label.actor", lookupIcon("Actor"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.actor", lookupIcon("Actor"));
-
- addField("label.name",
- getNameTextField());
- addField("label.namespace",
- getNamespaceSelector());
+ addField("label.name", getNameTextField());
+ addField("label.namespace", getNamespaceSelector());
add(getModifiersPanel());
addSeparator();
- addField("label.generalizations",
- getGeneralizationScroll());
- addField("label.specializations",
- getSpecializationScroll());
+ addField("label.generalizations", getGeneralizationScroll());
+ addField("label.specializations", getSpecializationScroll());
addSeparator();
- addField("label.association-ends",
- getAssociationEndScroll());
+ addField("label.association-ends", getAssociationEndScroll());
// The toolbar buttons that go at the top:
addAction(new ActionNavigateContainerElement());
@@ -78,4 +70,4 @@
addAction(getDeleteAction());
}
-} /* end class PropActor */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtend.java 2007-11-19 17:08:14-0800
@@ -43,7 +43,6 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* Builds the property panel for an Extend relationship.<p>
@@ -72,8 +71,7 @@
*/
public PropPanelExtend() {
- super("label.extend", lookupIcon("Extend"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.extend", lookupIcon("Extend"));
addField("label.name",
getNameTextField());
@@ -150,21 +148,16 @@
@Override
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
- if (Model.getFacade().isAExtend(target)) {
- Object ns = Model.getFacade().getNamespace(target);
- if (ns != null) {
- if (Model.getFacade().getBase(target) != null) {
- Object extensionPoint =
- Model.getUseCasesFactory()
- .buildExtensionPoint(
- Model.getFacade().getBase(target));
- Model.getUseCasesHelper().addExtensionPoint(
- target,
- extensionPoint);
- TargetManager.getInstance().setTarget(extensionPoint);
- super.actionPerformed(e);
- }
- }
+ if (Model.getFacade().isAExtend(target)
+ && Model.getFacade().getNamespace(target) != null
+ && Model.getFacade().getBase(target) != null) {
+ Object extensionPoint =
+ Model.getUseCasesFactory().buildExtensionPoint(
+ Model.getFacade().getBase(target));
+ Model.getUseCasesHelper().addExtensionPoint(target,
+ extensionPoint);
+ TargetManager.getInstance().setTarget(extensionPoint);
+ super.actionPerformed(e);
}
}
}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtensionPoint.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtensionPoint.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtensionPoint.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtensionPoint.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtensionPoint.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelExtensionPoint.java 2007-11-19 17:08:14-0800
@@ -40,7 +40,6 @@
import org.argouml.uml.ui.UMLTextField2;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* Builds the property panel for an extension point.<p>
@@ -60,17 +59,16 @@
* Construct a new property panel for an ExtensionPoint.
*/
public PropPanelExtensionPoint() {
- super("label.extension-point", ConfigLoader.getTabPropsOrientation());
+ super("label.extension-point", lookupIcon("ExtensionPoint"));
// First column
// nameField, stereotypeBox and namespaceScroll are all set up by
// PropPanelModelElement.
- addField("label.name",
- getNameTextField());
+ addField("label.name", getNameTextField());
- // Our location (a String). Allow the location label to
+ // Our location (a String). Allow the location label to
// expand vertically so we all float to the top.
JTextField locationField = new UMLTextField2(
@@ -88,7 +86,6 @@
addField("label.extend",
new JScrollPane(extendList));
-
addAction(new ActionNavigateContainerElement());
addAction(new ActionNewExtensionPoint());
addAction(new ActionNewStereotype());
@@ -102,6 +99,7 @@
* This is a change from the norm, which is to navigate to the parent
* namespace.<p>
*/
+ @Override
public void navigateUp() {
Object target = getTarget();
@@ -140,6 +138,7 @@
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
if (Model.getFacade().isAExtensionPoint(target)) {
@@ -151,4 +150,4 @@
}
}
-} /* end class PropPanelExtend */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelInclude.java 2007-11-19 17:08:14-0800
@@ -31,7 +31,6 @@
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* Builds the property panel for an Include relationship.<p>
@@ -54,14 +53,10 @@
* Construct a property panel for Include model elements.
*/
public PropPanelInclude() {
- super("label.includes",
- lookupIcon("Include"),
- ConfigLoader.getTabPropsOrientation());
-
- addField("label.name",
- getNameTextField());
- addField("label.namespace",
- getNamespaceSelector());
+ super("label.include", lookupIcon("Include"));
+
+ addField("label.name", getNameTextField());
+ addField("label.namespace", getNamespaceSelector());
addSeparator();
@@ -162,4 +157,4 @@
}
-} /* end class PropPanelInclude */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java 2007-11-19 17:08:14-0800
@@ -24,7 +24,6 @@
package org.argouml.uml.ui.behavior.use_cases;
-
import javax.swing.JList;
import javax.swing.JScrollPane;
@@ -35,7 +34,6 @@
import org.argouml.uml.ui.foundation.core.ActionAddOperation;
import org.argouml.uml.ui.foundation.core.PropPanelClassifier;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* Builds the property panel for a use case.<p>
@@ -53,29 +51,20 @@
* Construct a property panel for a UseCase.
*/
public PropPanelUseCase() {
- // TODO: I18N
- super("label.usecase",
- lookupIcon("UseCase"),
- ConfigLoader.getTabPropsOrientation());
-
- addField("label.name",
- getNameTextField());
- addField("label.namespace",
- getNamespaceSelector());
+ super("label.usecase", lookupIcon("UseCase"));
+
+ addField("label.name", getNameTextField());
+ addField("label.namespace", getNamespaceSelector());
add(getModifiersPanel());
- addField("label.client-dependencies",
- getClientDependencyScroll());
- addField("label.supplier-dependencies",
- getSupplierDependencyScroll());
+ addField("label.client-dependencies", getClientDependencyScroll());
+ addField("label.supplier-dependencies", getSupplierDependencyScroll());
addSeparator();
- addField("label.generalizations",
- getGeneralizationScroll());
- addField("label.specializations",
- getSpecializationScroll());
+ addField("label.generalizations", getGeneralizationScroll());
+ addField("label.specializations", getSpecializationScroll());
JList extendsList = new UMLLinkedList(new UMLUseCaseExtendListModel());
addField("label.extends",
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAbstraction.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAbstraction.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAbstraction.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAbstraction.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAbstraction.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAbstraction.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -26,7 +26,6 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.ActionNavigateNamespace;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a Abstraction.
@@ -42,10 +41,9 @@
* Construct a new property panel for an Abstraction.
*/
public PropPanelAbstraction() {
- super("Abstraction", ConfigLoader.getTabPropsOrientation());
+ super("label.abstraction", lookupIcon("Abstraction"));
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
getNamespaceSelector());
@@ -60,5 +58,5 @@
addAction(getDeleteAction());
}
-} /* end class PropPanelAbstraction */
+}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociation.java 2007-11-19 17:08:14-0800
@@ -32,11 +32,10 @@
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
- * Theproperties panel for a Association.
+ * The properties panel for a Association.
*
*/
public class PropPanelAssociation extends PropPanelRelationship {
@@ -71,40 +70,45 @@
* Construct a property panel for UML Association elements.
*/
public PropPanelAssociation() {
- this("label.association",
- ConfigLoader.getTabPropsOrientation());
- addField("label.name",
- getNameTextField());
- addField("label.namespace",
- getNamespaceSelector());
+ this("label.association");
+ addField("label.name", getNameTextField());
+ addField("label.namespace", getNamespaceSelector());
add(modifiersPanel);
addSeparator();
- addField("label.connections",
- assocEndScroll);
+ addField("label.connections", assocEndScroll);
addSeparator();
- addField("label.association-roles",
- associationRoleScroll);
- addField("label.association-links",
- linksScroll);
+ addField("label.association-roles", associationRoleScroll);
+ addField("label.association-links", linksScroll);
addAction(new ActionNavigateContainerElement());
addAction(new ActionNewStereotype());
addAction(getDeleteAction());
-
}
/**
* Construct a property panel for an Association.
- *
+ *
* @param title the title of the panel
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use {@link #PropPanelAssociation()}.
*/
+ @Deprecated
protected PropPanelAssociation(String title, Orientation orientation) {
- super(title, lookupIcon("Association"), orientation);
+ this(title);
+ setOrientation(orientation);
+ }
+
+ /**
+ * Construct a property panel for an Association.
+ *
+ * @param title the title of the panel
+ */
+ protected PropPanelAssociation(String title) {
+ super(title, lookupIcon("Association"));
initialize();
JList assocEndList = new UMLLinkedList(
new UMLAssociationConnectionListModel());
@@ -130,4 +134,4 @@
}
-} /* end class PropPanelAssociation */
+}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java 2007-11-19 17:08:14-0800
@@ -31,7 +31,6 @@
import org.argouml.uml.ui.ActionNavigateNamespace;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for an AssociationClass.
@@ -64,9 +63,7 @@
* Construct a property panel for AssociationClass elements.
*/
public PropPanelAssociationClass() {
- super("label.association-class",
- lookupIcon("AssociationClass"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.association-class", lookupIcon("AssociationClass"));
addField(Translator.localize("label.name"),
getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java 2007-11-19 17:08:14-0800
@@ -24,6 +24,7 @@
package org.argouml.uml.ui.foundation.core;
+import javax.swing.ImageIcon;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JPanel;
@@ -38,7 +39,6 @@
import org.argouml.uml.ui.UMLMutableLinkedList;
import org.argouml.uml.ui.UMLSingleRowSelector;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
@@ -114,6 +114,9 @@
* The list of qualifiers that owns this association end
*/
private JScrollPane qualifiersScroll;
+
+ private String associationLabel;
+
/**
* Constructs the proppanel including initializing all scrollpanes, panels
@@ -121,13 +124,26 @@
* @param name name/title of the property panel
* @param orientation orientation of the panel
* @see org.argouml.uml.ui.PropPanel#PropPanel(String, Orientation)
+ * @deprecated for 0.25.4 by tfmorris. Use setOrientation after
+ * instantiation to select orientation.
*/
+ @Deprecated
protected PropPanelAssociationEnd(String name, Orientation orientation) {
super(name, orientation);
}
- private String associationLabel;
+ /**
+ * Constructs the proppanel including initializing all scrollpanes, panels
+ * etc. but excluding placing them on the proppanel itself.
+ *
+ * @param name name/title of the property panel
+ * @param orientation orientation of the panel
+ * @see org.argouml.uml.ui.PropPanel#PropPanel(String, ImageIcon)
+ */
+ protected PropPanelAssociationEnd(String name, ImageIcon icon) {
+ super(name, icon);
+ }
/**
* Constructs the proppanel and places all scrollpanes etc. on the canvas.
@@ -135,8 +151,7 @@
* @see java.lang.Object#Object()
*/
public PropPanelAssociationEnd() {
- super("label.association-end",
- ConfigLoader.getTabPropsOrientation());
+ super("label.association-end", lookupIcon("AssociationEnd"));
associationLabel = Translator.localize("label.association");
createControls();
positionStandardControls();
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java 2007-11-19 17:08:14-0800
@@ -40,7 +40,6 @@
import org.argouml.uml.ui.UMLExpressionModel2;
import org.argouml.uml.ui.UMLUserInterfaceContainer;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for an Attribute of a Classifier,
@@ -61,7 +60,7 @@
*
*/
public PropPanelAttribute() {
- super("Attribute", ConfigLoader.getTabPropsOrientation());
+ super("label.attribute", lookupIcon("Attribute"));
addField(Translator.localize("label.name"),
getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClass.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClass.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClass.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClass.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClass.java 2007-11-19 17:08:14-0800
@@ -26,7 +26,6 @@
import org.argouml.uml.ui.ActionNavigateNamespace;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a Class.
@@ -42,14 +41,10 @@
* Construct a property panel for UML Class elements.
*/
public PropPanelClass() {
- super("label.class",
- lookupIcon("Class"),
- ConfigLoader.getTabPropsOrientation());
-
- addField("label.name",
- getNameTextField());
- addField("label.namespace",
- getNamespaceSelector());
+ super("label.class", lookupIcon("Class"));
+
+ addField("label.name", getNameTextField());
+ addField("label.namespace", getNamespaceSelector());
getModifiersPanel().add(new UMLClassActiveCheckBox());
add(getModifiersPanel());
add(getNamespaceVisibilityPanel());
@@ -86,4 +81,4 @@
addAction(getDeleteAction());
}
-} /* end class PropPanelClass */
+}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelClassifier.java 2007-11-19 17:08:14-0800
@@ -82,11 +82,27 @@
new UMLClassOperationListModel();
/**
+ * Construct a property panel for a Classififer with the given name and
+ * icon.
+ *
+ * @param name the title of the properties panel
+ * @param icon the icon shown next to the name
+ */
+ public PropPanelClassifier(String name, ImageIcon icon) {
+ super(name, icon);
+ initialize();
+ }
+
+ /**
* The constructor.
*
* @param title the title of the properties panel
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelClassifier(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelClassifier(String title, Orientation orientation) {
super(title, orientation);
initialize();
@@ -98,7 +114,11 @@
* @param name the title of the properties panel
* @param orientation the orientation of the panel
* @param icon the icon shown next to the name
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelClassifier(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelClassifier(String name, ImageIcon icon,
Orientation orientation) {
super(name, icon, orientation);
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComment.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComment.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComment.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComment.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComment.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -36,7 +36,6 @@
import org.argouml.uml.ui.UMLPlainTextDocument;
import org.argouml.uml.ui.UMLTextArea2;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* Proppanel for comments (notes). <p>
@@ -56,7 +55,7 @@
* Construct a property panel for a Comment.
*/
public PropPanelComment() {
- super("Comment", ConfigLoader.getTabPropsOrientation());
+ super("label.comment", lookupIcon("Comment"));
addField(Translator.localize("label.name"),
getNameTextField());
@@ -132,6 +131,7 @@
/*
* @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent arg0) {
super.actionPerformed(arg0);
Model.getCoreHelper().removeAnnotatedElement(
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComponent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComponent.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComponent.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComponent.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComponent.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelComponent.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -31,7 +31,6 @@
import org.argouml.uml.ui.ActionNavigateNamespace;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* PropPanel for a UML Component.
@@ -49,11 +48,8 @@
* Construct a property panel for Component elements.
*/
public PropPanelComponent() {
- super("Component",
- lookupIcon("Component"),
- ConfigLoader.getTabPropsOrientation());
- addField(Translator.localize("label.name"),
- getNameTextField());
+ super("label.component", lookupIcon("Component"));
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
getNamespaceSelector());
add(getModifiersPanel());
@@ -84,6 +80,7 @@
}
-} /* end class PropPanelComponent */
+}
+
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelConstraint.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelConstraint.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelConstraint.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelConstraint.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelConstraint.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelConstraint.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -33,7 +33,6 @@
import org.argouml.uml.ui.UMLPlainTextDocument;
import org.argouml.uml.ui.UMLTextArea2;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* Proppanel for Constraints . <p>
@@ -50,7 +49,7 @@
* Construct a property panel for Constraint elements.
*/
public PropPanelConstraint() {
- super("Constraint", ConfigLoader.getTabPropsOrientation());
+ super("label.constraint", lookupIcon("Constraint"));
addField(Translator.localize("label.name"),
getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDataType.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDataType.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDataType.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDataType.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDataType.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDataType.java 2007-11-19 17:08:14-0800
@@ -39,7 +39,6 @@
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
@@ -58,10 +57,26 @@
* @param title title string for the property panel
* @param icon icon
* @param orientation horizontal or vertical orientation
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelModelDataType(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelDataType(String title, ImageIcon icon,
Orientation orientation) {
- super(title, icon, orientation);
+ this(title, icon);
+ setOrientation(orientation);
+ }
+
+ /**
+ * Construct a property panel for UML DataType elements.
+ *
+ * @param title title string for the property panel
+ * @param icon icon
+ * @param orientation horizontal or vertical orientation
+ */
+ public PropPanelDataType(String title, ImageIcon icon) {
+ super(title, icon);
addField(Translator.localize("label.name"),
getNameTextField());
@@ -105,8 +120,7 @@
* The constructor.
*/
public PropPanelDataType() {
- this("DataType", lookupIcon("DataType"),
- ConfigLoader.getTabPropsOrientation());
+ this("label.data-type", lookupIcon("DataType"));
}
private static class ActionAddQueryOperation
@@ -123,6 +137,7 @@
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
if (Model.getFacade().isAClassifier(target)) {
@@ -150,6 +165,7 @@
*
* @return JScrollPane
*/
+ @Override
public JScrollPane getOperationScroll() {
if (operationScroll == null) {
JList list = new UMLLinkedList(operationListModel);
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDependency.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDependency.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDependency.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDependency.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDependency.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelDependency.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -24,6 +24,7 @@
package org.argouml.uml.ui.foundation.core;
+import javax.swing.ImageIcon;
import javax.swing.JList;
import javax.swing.JScrollPane;
@@ -31,7 +32,6 @@
import org.argouml.uml.ui.ActionNavigateNamespace;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
@@ -62,7 +62,7 @@
* dependency itself) but does not have a proppanel of their own.
*/
public PropPanelDependency() {
- this("Dependency", ConfigLoader.getTabPropsOrientation());
+ this("label.dependency", lookupIcon("Dependency"));
addField(Translator.localize("label.name"),
getNameTextField());
@@ -84,10 +84,24 @@
/**
* Constructor that should be used by subclasses to initialize the
* attributes a dependency has.
- * @see org.argouml.uml.ui.PropPanel#PropPanel(String, Orientation)
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelDependency(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
protected PropPanelDependency(String name, Orientation orientation) {
- super(name, lookupIcon(name), orientation);
+ this(name, lookupIcon(name));
+ setOrientation(orientation);
+ }
+
+
+ /**
+ * Constructor that should be used by subclasses to initialize the
+ * attributes a dependency has.
+ * @see org.argouml.uml.ui.PropPanel#PropPanel(String, ImageIcon)
+ */
+ protected PropPanelDependency(String name, ImageIcon icon) {
+ super(name, icon);
JList supplierList = new UMLLinkedList(
new UMLDependencySupplierListModel(), true);
supplierScroll = new JScrollPane(supplierList);
@@ -112,4 +126,4 @@
}
-} /* end class PropPanelDependency */
+}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelElementResidence.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelElementResidence.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelElementResidence.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelElementResidence.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelElementResidence.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelElementResidence.java 2007-11-19 17:08:14-0800
@@ -28,7 +28,6 @@
import org.argouml.model.Model;
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.UMLModelElementListModel2;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a ElementResidence. <p>
@@ -44,7 +43,7 @@
* Construct a property panel for a ElementResidence.
*/
public PropPanelElementResidence() {
- super("ElementResidence", ConfigLoader.getTabPropsOrientation());
+ super("label.element-residence", lookupIcon("ElementResidence"));
add(getNamespaceVisibilityPanel());
addSeparator();
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumeration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumeration.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumeration.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumeration.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumeration.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumeration.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -29,10 +29,9 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.UMLLinkedList;
-import org.argouml.util.ConfigLoader;
/**
- * The properties panel for a Datatype.
+ * The properties panel for an Enumeration element.
*/
public class PropPanelEnumeration extends PropPanelDataType {
@@ -42,19 +41,18 @@
new UMLEnumerationLiteralsListModel();
/**
- * The constructor.
+ * Construct a property panel for the UML Enumeration element.
*/
public PropPanelEnumeration() {
- super("Enumeration", lookupIcon("Enumeration"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.enumeration-title", lookupIcon("Enumeration"));
- addField(Translator.localize("label.literals"),
- getLiteralsScroll());
+ addField(Translator.localize("label.literals"), getLiteralsScroll());
}
/*
* @see org.argouml.uml.ui.foundation.core.PropPanelDataType#addEnumerationButtons()
*/
+ @Override
protected void addEnumerationButtons() {
super.addEnumerationButtons();
addAction(new ActionAddLiteral());
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumerationLiteral.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumerationLiteral.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumerationLiteral.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumerationLiteral.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumerationLiteral.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelEnumerationLiteral.java 2007-11-19 17:08:14-0800
@@ -33,7 +33,6 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for an EnumerationLiteral.
@@ -55,7 +54,7 @@
* Construct a property panel for UML EnumerationLiterals.
*/
public PropPanelEnumerationLiteral() {
- super("EnumerationLiteral", ConfigLoader.getTabPropsOrientation());
+ super("label.enumeration-literal", lookupIcon("EnumerationLiteral"));
addField(Translator.localize("label.name"),
getNameTextField());
@@ -68,7 +67,7 @@
addAction(new ActionNewStereotype());
addAction(getDeleteAction());
}
-} /* end class PropPanelAttribute */
+}
/**
* The list model for the namespace of a diagram.
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFeature.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFeature.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFeature.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFeature.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFeature.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFeature.java 2007-11-19 17:08:14-0800
@@ -48,11 +48,28 @@
private JPanel visibilityPanel;
/**
+ * Construct a property panel for a Feature with the given name and icon.
+ *
+ * @param name name of property which contains string to use for property
+ * panel name. This will be localized by the super
+ * constructor.
+ * @param icon icon
+ */
+ protected PropPanelFeature(String name, ImageIcon icon) {
+ super(name, icon);
+ }
+
+ /**
* Constructor.
+ *
* @param name name
* @param icon icon
* @param orientation orientation
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelModelElement(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
protected PropPanelFeature(String name, ImageIcon icon,
Orientation orientation) {
super(name, icon, orientation);
@@ -63,7 +80,11 @@
*
* @param name the name to be shown at the top of the panel
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelModelElement(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
protected PropPanelFeature(String name, Orientation orientation) {
super(name, orientation);
}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFlow.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFlow.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFlow.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFlow.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFlow.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelFlow.java 2007-11-19 17:08:14-0800
@@ -25,7 +25,6 @@
package org.argouml.uml.ui.foundation.core;
import org.argouml.i18n.Translator;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a Flow.
@@ -44,13 +43,12 @@
* Construct a property panel for Flow elements.
*/
public PropPanelFlow() {
- super("Flow", ConfigLoader.getTabPropsOrientation());
+ super("label.flow", lookupIcon("Flow"));
initialize();
}
private void initialize() {
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
getNamespaceSelector());
addField(Translator.localize("label.constraints"),
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelGeneralization.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelGeneralization.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelGeneralization.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelGeneralization.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelGeneralization.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelGeneralization.java 2007-11-19 17:08:14-0800
@@ -33,7 +33,6 @@
import org.argouml.uml.ui.UMLComboBox2;
import org.argouml.uml.ui.UMLTextField2;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a Generalization.
@@ -54,17 +53,12 @@
* Construct a property panel for Generalization elements.
*/
public PropPanelGeneralization() {
- super(
- Translator.localize("label.generalization"),
- lookupIcon("Generalization"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.generalization", lookupIcon("Generalization"));
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.discriminator"),
getDiscriminatorTextField());
- addField(Translator.localize("label.namespace"),
- getNamespaceSelector());
+ addField(Translator.localize("label.namespace"), getNamespaceSelector());
addSeparator();
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelInterface.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelInterface.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelInterface.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelInterface.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelInterface.java 2007-11-19 17:08:14-0800
@@ -27,11 +27,9 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.ActionNavigateNamespace;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for an Interface.
- *
*/
public class PropPanelInterface extends PropPanelClassifier {
@@ -44,7 +42,7 @@
* Construct a property panel for UML Interface elements.
*/
public PropPanelInterface() {
- super("Interface", ConfigLoader.getTabPropsOrientation());
+ super("label.interface", lookupIcon("Interface"));
addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
@@ -75,4 +73,4 @@
addAction(getDeleteAction());
}
-} /* end class PropPanelInterface */
+}
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=13794&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=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelMethod.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -43,7 +43,6 @@
import org.argouml.uml.ui.UMLPlainTextDocument;
import org.argouml.uml.ui.UMLTextArea2;
import org.argouml.uml.ui.UMLTextField2;
-import org.argouml.util.ConfigLoader;
import org.tigris.gef.undo.UndoableAction;
/**
@@ -64,8 +63,7 @@
* Construct a property panel for UML Method elements.
*/
public PropPanelMethod() {
- super("Method", lookupIcon("Method"), ConfigLoader
- .getTabPropsOrientation());
+ super("label.method", lookupIcon("Method"));
UMLPlainTextDocument uptd = new UMLMethodBodyDocument();
addField(Translator.localize("label.name"),
@@ -334,4 +332,4 @@
* The UID.
*/
private static final long serialVersionUID = -6443549338375514393L;
-} /* end class PropPanelMethod */
+}
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=13794&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=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java 2007-11-19 17:08:14-0800
@@ -44,7 +44,6 @@
import org.argouml.uml.ui.UMLPlainTextDocument;
import org.argouml.uml.ui.UMLSearchableComboBox;
import org.argouml.uml.ui.UMLTextField2;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
@@ -100,33 +99,54 @@
new UMLModelElementTargetFlowListModel();
/**
- * The constructor.
- *
+ * Construct a property panel for a model element with the given name, icon,
+ * and orientation.
+ *
* @param name the name of the properties panel
* @param icon the icon to be shown next to the name
* @param orientation the orientation
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelModelElement(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelModelElement(String name, ImageIcon icon,
Orientation orientation) {
- super(name, icon, orientation);
+ super(name, icon);
+ setOrientation(orientation);
}
/**
- * The constructor.
- *
+ * Construct a property panel for a model element with the given name and
+ * icon.
+ *
* @param name the name of the properties panel
* @param orientation the orientation
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelModelElement(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelModelElement(String name, Orientation orientation) {
super(name, orientation);
}
/**
+ * The constructor.
+ *
+ * @param name the name of the properties panel
+ * @param icon the ico
+ */
+ public PropPanelModelElement(String name, ImageIcon icon) {
+ super(name, icon);
+ }
+
+ /**
* Constructor that is used if no other proppanel can be found for a
* modelelement of some kind. Since this is the default
*/
public PropPanelModelElement() {
- this("ModelElement", null, ConfigLoader.getTabPropsOrientation());
+ this("label.model-element-title", (ImageIcon) null);
addField("label.name",
getNameTextField());
addField("label.namespace",
@@ -168,9 +188,9 @@
/**
* @return a scrollpane for the namespace
- * @deprecated use {@link #getNamespaceSelector()}
- * When was this deprecated? Can it be removed?
+ * @deprecated for 0.24 by bobtarling. Use {@link #getNamespaceSelector()}
*/
+ @Deprecated
protected JComponent getNamespaceScroll() {
if (namespaceScroll == null) {
JList namespaceList = new UMLLinkedList(namespaceListModel);
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNamespace.java 2007-11-19 17:08:14-0800
@@ -44,12 +44,26 @@
new UMLNamespaceOwnedElementListModel();
/**
+ * Construct a property panel for a Namespace with the given name and icon.
+ *
+ * @param panelName the name of the panel to be shown at the top
+ * @param icon the icon to be shown next to the name
+ */
+ public PropPanelNamespace(String panelName, ImageIcon icon) {
+ super(panelName, icon);
+ }
+
+ /**
* The constructor.
*
* @param panelName the name of the panel to be shown at the top
* @param icon the icon to be shown next to the name
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelModelNamespace(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelNamespace(String panelName, ImageIcon icon,
Orientation orientation) {
super(panelName, icon, orientation);
@@ -60,7 +74,11 @@
*
* @param title the name of the panel to be shown at the top
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelModelNamespace(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelNamespace(String title, Orientation orientation) {
super(title, orientation);
}
@@ -121,4 +139,4 @@
}
-} /* end class PropPanelClass */
+}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNode.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNode.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNode.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNode.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelNode.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -33,7 +33,6 @@
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.UMLModelElementListModel2;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* TODO: this property panel needs refactoring to remove dependency on
@@ -52,20 +51,16 @@
* Construct a property panel for a UML Node element.
*/
public PropPanelNode() {
- super("Node", lookupIcon("Node"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.node", lookupIcon("Node"));
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
getNamespaceSelector());
-
add(getModifiersPanel());
addSeparator();
addField("Generalizations:", getGeneralizationScroll());
-
addField("Specializations:", getSpecializationScroll());
addSeparator();
@@ -82,7 +77,7 @@
}
-} /* end class PropPanelNode */
+}
class UMLNodeDeployedComponentListModel extends UMLModelElementListModel2 {
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelOperation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelOperation.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelOperation.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelOperation.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelOperation.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelOperation.java 2007-11-19 17:08:14-0800
@@ -43,7 +43,6 @@
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.UMLTextArea2;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* A property panel for Operations of Classifiers.
@@ -59,8 +58,7 @@
* The constructor.
*/
public PropPanelOperation() {
- super("Operation", lookupIcon("Operation"), ConfigLoader
- .getTabPropsOrientation());
+ super("label.operation", lookupIcon("Operation"));
addField(Translator.localize("label.name"),
getNameTextField());
@@ -138,10 +136,9 @@
public void addRaisedSignal() {
Object target = getTarget();
if (Model.getFacade().isAOperation(target)) {
- Object oper = /* (MOperation) */target;
+ Object oper = target;
Object newSignal = Model.getCommonBehaviorFactory()
.createSignal();
- //((MOperation)oper).getFactory().createSignal();
Model.getCoreHelper().addOwnedElement(
Model.getFacade().getNamespace(
@@ -158,7 +155,7 @@
public void addMethod() {
Object target = getTarget();
if (Model.getFacade().isAOperation(target)) {
- Object oper = /* (MOperation) */target;
+ Object oper = target;
String name = Model.getFacade().getName(oper);
Object newMethod = Model.getCoreFactory().buildMethod(name);
Model.getCoreHelper().addMethod(oper, newMethod);
@@ -189,6 +186,7 @@
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
Object target = TargetManager.getInstance().getModelTarget();
if (Model.getFacade().isAOperation(target)) {
@@ -220,6 +218,7 @@
/*
* @see org.tigris.gef.undo.UndoableAction#isEnabled()
*/
+ @Override
public boolean isEnabled() {
Object target = TargetManager.getInstance().getModelTarget();
boolean result = true;
@@ -235,6 +234,7 @@
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
Object target = TargetManager.getInstance().getModelTarget();
@@ -252,6 +252,7 @@
*
* @see org.argouml.uml.ui.PropPanel#getDisplayNamespace()
*/
+ @Override
protected Object getDisplayNamespace() {
Object namespace = null;
Object target = getTarget();
@@ -265,4 +266,4 @@
return namespace;
}
-} /* end class PropPanelOperation */
+}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelParameter.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelParameter.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelParameter.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelParameter.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelParameter.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelParameter.java 2007-11-19 17:08:14-0800
@@ -41,7 +41,6 @@
import org.argouml.uml.ui.UMLExpressionModel2;
import org.argouml.uml.ui.UMLUserInterfaceContainer;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
-import org.argouml.util.ConfigLoader;
/**
* The property panel for parameters.
@@ -61,13 +60,9 @@
* Construct a property panel for UML Parameter elements.
*/
public PropPanelParameter() {
- super(
- "Parameter",
- lookupIcon("Parameter"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.parameter", lookupIcon("Parameter"));
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.owner"),
getBehavioralFeatureScroll());
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelPermission.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -26,7 +26,6 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.ActionNavigateNamespace;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a Permission.
@@ -48,10 +47,9 @@
* Construct a property panel for UML Permission elements.
*/
public PropPanelPermission() {
- super("Permission", ConfigLoader.getTabPropsOrientation());
+ super("label.permission", lookupIcon("Permission"));
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
getNamespaceSelector());
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelRelationship.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -26,7 +26,6 @@
import javax.swing.ImageIcon;
-import org.argouml.util.ConfigLoader;
import org.tigris.swidgets.Orientation;
/**
@@ -39,12 +38,27 @@
public class PropPanelRelationship extends PropPanelModelElement {
/**
+ * Construct a property panel for a Relationship with the given name and
+ * icon.
+ *
+ * @param name The name of the panel to be shown at the top.
+ * @param icon The icon to be shown next to the name.
+ */
+ public PropPanelRelationship(String name, ImageIcon icon) {
+ super(name, icon);
+ }
+
+ /**
* The constructor.
*
* @param name The name of the panel to be shown at the top.
* @param orientation The orientation of the panel.
* @param icon The icon to be shown next to the name.
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelRelationship(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelRelationship(String name, ImageIcon icon,
Orientation orientation) {
super(name, icon, orientation);
@@ -54,7 +68,7 @@
* Constructor for PropPanelRelationship.
*/
public PropPanelRelationship() {
- super("Relationship", ConfigLoader.getTabPropsOrientation());
+ super("label.relationship", lookupIcon("Relationship"));
}
/**
@@ -62,7 +76,11 @@
*
* @param name the name of the panel to be shown at the top
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelRelationship(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelRelationship(String name, Orientation orientation) {
super(name, orientation);
}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelStructuralFeature.java 2007-11-19 17:08:14-0800
@@ -24,6 +24,7 @@
package org.argouml.uml.ui.foundation.core;
+import javax.swing.ImageIcon;
import javax.swing.JPanel;
import org.argouml.i18n.Translator;
@@ -49,12 +50,24 @@
/**
* Constructor for PropPanelStructuralFeature.
* @param name the name of the panel, to be shown at the top
+ */
+ protected PropPanelStructuralFeature(String name, ImageIcon icon) {
+ super(name, icon);
+
+ }
+
+ /**
+ * Constructor for PropPanelStructuralFeature.
+ * @param name the name of the panel, to be shown at the top
* @param orientation the orientation of the panel
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelStructuralFeature(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
protected PropPanelStructuralFeature(String name,
Orientation orientation) {
super(name, orientation);
-
}
/**
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelUsage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelUsage.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelUsage.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelUsage.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelUsage.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelUsage.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -26,7 +26,6 @@
import org.argouml.i18n.Translator;
import org.argouml.uml.ui.ActionNavigateNamespace;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for a Usage.
@@ -43,10 +42,9 @@
* Construct a property panel for Usage elements.
*/
public PropPanelUsage() {
- super("Usage", ConfigLoader.getTabPropsOrientation());
+ super("label.usage", lookupIcon("Usage"));
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
getNamespaceSelector());
@@ -61,5 +59,4 @@
addAction(getDeleteAction());
}
-} /* end class PropPanelUsage */
-
+}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelStereotype.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelStereotype.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelStereotype.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelStereotype.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelStereotype.java 2007-11-19 17:08:14-0800
@@ -52,7 +52,6 @@
import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementLeafCheckBox;
import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementRootCheckBox;
import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementSpecializationListModel;
-import org.argouml.util.ConfigLoader;
import org.tigris.gef.undo.UndoManager;
/**
@@ -95,8 +94,7 @@
* Construct a stereotype properties panel.
*/
public PropPanelStereotype() {
- super("Stereotype", lookupIcon("Stereotype"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.stereotype-title", lookupIcon("Stereotype"));
addField(Translator.localize("label.name"), getNameTextField());
@@ -325,4 +323,4 @@
}
}
}
-} /* end class PropPanelStereotype */
\ No newline at end of file
+}
\ No newline at end of file
Modified: trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java 2007-11-19 17:08:14-0800
@@ -53,7 +53,6 @@
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
import org.argouml.uml.ui.foundation.core.UMLModelElementNamespaceComboBoxModel;
import org.argouml.uml.ui.foundation.core.UMLStructuralFeatureTypeComboBoxModel;
-import org.argouml.util.ConfigLoader;
import org.tigris.gef.undo.UndoableAction;
/**
@@ -90,9 +89,7 @@
* Construct a property panel for TagDefinition elements.
*/
public PropPanelTagDefinition() {
- super("TagDefinition",
- lookupIcon("TagDefinition"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.tag-definition-title", lookupIcon("TagDefinition"));
addField(Translator.localize("label.name"),
getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTaggedValue.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2006 The Regents of the University of California. All
+// Copyright (c) 2006-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -44,7 +44,6 @@
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.UMLModelElementListModel2;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
-import org.argouml.util.ConfigLoader;
import org.tigris.gef.undo.UndoableAction;
/**
@@ -67,7 +66,7 @@
* The constructor.
*/
public PropPanelTaggedValue() {
- super("TaggedValue", ConfigLoader.getTabPropsOrientation());
+ super("label.tagged-value", lookupIcon("TaggedValue"));
addField(Translator.localize("label.name"),
getNameTextField());
Modified: trunk/src_new/org/argouml/uml/ui/model_management/PropPanelElementImport.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/model_management/PropPanelElementImport.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/model_management/PropPanelElementImport.java&p2=trunk/src_new/org/argouml/uml/ui/model_management/PropPanelElementImport.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/model_management/PropPanelElementImport.java (original)
+++ trunk/src_new/org/argouml/uml/ui/model_management/PropPanelElementImport.java 2007-11-19 17:08:14-0800
@@ -37,7 +37,6 @@
import org.argouml.uml.ui.UMLTextField2;
import org.argouml.uml.ui.foundation.core.ActionSetElementOwnershipSpecification;
import org.argouml.uml.ui.foundation.core.PropPanelModelElement;
-import org.argouml.util.ConfigLoader;
/**
* The properties panel for an ElementImport. <p>
@@ -58,7 +57,7 @@
* Constructor.
*/
public PropPanelElementImport() {
- super("ElementImport", ConfigLoader.getTabPropsOrientation());
+ super("label.element-import", lookupIcon("ElementImport"));
addField(Translator.localize("label.alias"),
getAliasTextField());
Modified: trunk/src_new/org/argouml/uml/ui/model_management/PropPanelModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/model_management/PropPanelModel.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/model_management/PropPanelModel.java&p2=trunk/src_new/org/argouml/uml/ui/model_management/PropPanelModel.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/model_management/PropPanelModel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/model_management/PropPanelModel.java 2007-11-19 17:08:14-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -34,7 +34,6 @@
import org.argouml.uml.ui.foundation.core.ActionAddEnumeration;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewTagDefinition;
-import org.argouml.util.ConfigLoader;
/**
* A Property panel for a model.
@@ -42,16 +41,15 @@
public class PropPanelModel extends PropPanelPackage {
/**
- * The constructor.
- */
+ * Construct a property panel for a UML Model element.
+ */
public PropPanelModel() {
- super("Model", lookupIcon("Model"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.model", lookupIcon("Model"));
}
+ @Override
protected void placeElements() {
- addField(Translator.localize("label.name"),
- getNameTextField());
+ addField(Translator.localize("label.name"), getNameTextField());
addField(Translator.localize("label.namespace"),
getNamespaceSelector());
Modified: trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java&p2=trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java (original)
+++ trunk/src_new/org/argouml/uml/ui/model_management/PropPanelPackage.java 2007-11-19 17:08:14-0800
@@ -54,7 +54,6 @@
import org.argouml.uml.ui.foundation.core.UMLGeneralizableElementSpecializationListModel;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewTagDefinition;
-import org.argouml.util.ConfigLoader;
import org.tigris.gef.undo.UndoableAction;
import org.tigris.swidgets.Orientation;
@@ -84,20 +83,35 @@
* Construct a default property panel for UML Package elements.
*/
public PropPanelPackage() {
- this("label.package", lookupIcon("Package"),
- ConfigLoader.getTabPropsOrientation());
+ this("label.package", lookupIcon("Package"));
}
/**
+ * Construct a property panel for UML Packages with the name and icon..
+ *
+ * @param title the title for this panel
+ * @param icon the icon to show next to the title
+ */
+ public PropPanelPackage(String title, ImageIcon icon) {
+ super(title, icon);
+ placeElements();
+ }
+
+ /**
* Construct a property panel for UML Packages with the given parameters.
*
* @param title the title for this panel
* @param orientation the orientation
* @param icon the icon to show next to the title
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #PropPanelModelPackage(String, ImageIcon)} and
+ * setOrientation() after instantiation.
*/
+ @Deprecated
public PropPanelPackage(String title, ImageIcon icon,
Orientation orientation) {
- super(title, icon, orientation);
+ super(title, icon);
+ setOrientation(orientation);
placeElements();
}
@@ -106,10 +120,8 @@
* should override to place the elements the way they want.
*/
protected void placeElements() {
- addField("label.name",
- getNameTextField());
- addField("label.namespace",
- getNamespaceSelector());
+ addField("label.name", getNameTextField());
+ addField("label.namespace", getNamespaceSelector());
add(getNamespaceVisibilityPanel());
@@ -193,6 +205,12 @@
} /* end class PropPanelPackage */
+/**
+ * NOTE: This class almost, but not quite, implements the interfaces
+ * defined in {@link org.argouml.uml.ui.AbstractActionAddModelElement}. The difference
+ * is that the doIt(), getChoices(), and getSelected() methods here
+ * accept an extra argument containing the target.
+ */
class ActionDialogElementImport extends UndoableAction {
public ActionDialogElementImport() {
@@ -207,6 +225,7 @@
/**
* @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
Object target = TargetManager.getInstance().getSingleModelTarget();
Modified: trunk/src_new/org/argouml/uml/ui/model_management/PropPanelSubsystem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/model_management/PropPanelSubsystem.java?view=diff&rev=13794&p1=trunk/src_new/org/argouml/uml/ui/model_management/PropPanelSubsystem.java&p2=trunk/src_new/org/argouml/uml/ui/model_management/PropPanelSubsystem.java&r1=13793&r2=13794
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/model_management/PropPanelSubsystem.java (original)
+++ trunk/src_new/org/argouml/uml/ui/model_management/PropPanelSubsystem.java 2007-11-19 17:08:14-0800
@@ -38,7 +38,6 @@
import org.argouml.uml.ui.AbstractActionNewModelElement;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.core.UMLClassifierFeatureListModel;
-import org.argouml.util.ConfigLoader;
/**
* A property panel for UML subsystems.
@@ -51,12 +50,10 @@
new UMLClassifierFeatureListModel();
/**
- * The constructor.
- *
+ * Construct a property panel for a Subsystem.
*/
public PropPanelSubsystem() {
- super("Subsystem", lookupIcon("Subsystem"),
- ConfigLoader.getTabPropsOrientation());
+ super("label.subsystem", lookupIcon("Subsystem"));
addField(Translator.localize("label.available-features"),
getFeatureScroll());
@@ -124,4 +121,4 @@
* The UID.
*/
private static final long serialVersionUID = -8616239241648089917L;
-} /* end class PropPanelSubsystem */
+}
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.