Author: tfmorris
Date: 2007-11-03 19:46:20-0700
New Revision: 13708
Added:
trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java
- copied, changed from r13644, /trunk/modules/dev/src/org/argouml/uml/diagram/sequence/CallerListNodeBuilder.java
trunk/modules/dev/src/org/argouml/dev/DeveloperModule.java
- copied, changed from r13644, /trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java
trunk/modules/dev/src/org/argouml/dev/EventPumpInspectorPanel.java
- copied, changed from r13644, /trunk/modules/dev/src/org/argouml/model/mdr/EventPumpInspectorPanel.java
trunk/modules/dev/src/org/argouml/dev/MessageNodeBuilder.java
- copied, changed from r13644, /trunk/modules/dev/src/org/argouml/uml/diagram/sequence/ui/MessageNodeBuilder.java
trunk/modules/dev/src/org/argouml/dev/TargetManagerPanel.java
- copied, changed from r13644, /trunk/modules/dev/src/org/argouml/ui/targetmanager/TargetManagerPanel.java
trunk/modules/dev/src/org/argouml/dev/UndoLogPanel.java
- copied, changed from r13644, /trunk/modules/dev/src/org/argouml/kernel/UndoLogPanel.java
trunk/modules/dev/src/org/argouml/dev/UndoManagerWrapper.java
- copied, changed from r13644, /trunk/modules/dev/src/org/argouml/kernel/UndoManagerWrapper.java
Removed:
trunk/modules/dev/src/org/argouml/kernel/
trunk/modules/dev/src/org/argouml/model/
trunk/modules/dev/src/org/argouml/ui/
trunk/modules/dev/src/org/argouml/uml/
Modified:
trunk/modules/dev/.settings/org.eclipse.jdt.core.prefs
trunk/modules/dev/.settings/org.eclipse.jdt.ui.prefs
trunk/modules/dev/ArgoUML dev.launch
trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java
trunk/modules/dev/src/org/argouml/dev/figinspector/FigTree.java
Log:
Issue 4878 - Fix dev module so that obeys encapsulation rules and isn't coupled to implementations
Modified: trunk/modules/dev/.settings/org.eclipse.jdt.core.prefs
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/.settings/org.eclipse.jdt.core.prefs?view=diff&rev=13708&p1=trunk/modules/dev/.settings/org.eclipse.jdt.core.prefs&p2=trunk/modules/dev/.settings/org.eclipse.jdt.core.prefs&r1=13707&r2=13708
==============================================================================
--- trunk/modules/dev/.settings/org.eclipse.jdt.core.prefs (original)
+++ trunk/modules/dev/.settings/org.eclipse.jdt.core.prefs 2007-11-03 19:46:20-0700
@@ -1,4 +1,4 @@
-#Sat Jun 30 21:55:30 EDT 2007
+#Sat Nov 03 14:37:13 EDT 2007
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -82,7 +82,7 @@
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=16
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
@@ -106,6 +106,7 @@
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
@@ -119,14 +120,19 @@
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.comment.clear_blank_lines=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
org.eclipse.jdt.core.formatter.comment.format_comments=true
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
org.eclipse.jdt.core.formatter.comment.format_source_code=true
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
org.eclipse.jdt.core.formatter.comment.line_length=80
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
@@ -296,6 +302,7 @@
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
@@ -316,9 +323,12 @@
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
Modified: trunk/modules/dev/.settings/org.eclipse.jdt.ui.prefs
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/.settings/org.eclipse.jdt.ui.prefs?view=diff&rev=13708&p1=trunk/modules/dev/.settings/org.eclipse.jdt.ui.prefs&p2=trunk/modules/dev/.settings/org.eclipse.jdt.ui.prefs&r1=13707&r2=13708
==============================================================================
--- trunk/modules/dev/.settings/org.eclipse.jdt.ui.prefs (original)
+++ trunk/modules/dev/.settings/org.eclipse.jdt.ui.prefs 2007-11-03 19:46:20-0700
@@ -1,7 +1,7 @@
-#Sat Jun 30 13:28:39 EDT 2007
+#Sat Nov 03 14:37:11 EDT 2007
eclipse.preferences.version=1
formatter_profile=_ArgoUML
-formatter_settings_version=10
+formatter_settings_version=11
internal.default.compliance=default
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
Modified: trunk/modules/dev/ArgoUML dev.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/ArgoUML%20dev.launch?view=diff&rev=13708&p1=trunk/modules/dev/ArgoUML%20dev.launch&p2=trunk/modules/dev/ArgoUML%20dev.launch&r1=13707&r2=13708
==============================================================================
--- trunk/modules/dev/ArgoUML dev.launch (original)
+++ trunk/modules/dev/ArgoUML dev.launch 2007-11-03 19:46:20-0700
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/argouml-module-dev"/>
+<listEntry value="/argouml/org/argouml/application/Main.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="argouml" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="gef" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="argouml"/> </runtimeClasspathEntry> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml-core-model-mdr" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-model-mdr/lib/jmi.jar" path="3" type="2"/> "/>
@@ -28,11 +30,8 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="argouml" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/argouml-core-lib/swidgets-0.1.4.jar" path="3" sourceAttachmentPath="/swidgets/src" sourceRootPath="" type="2"/> "/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="argouml-module-dev"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx400M -ea -Dlog4j.configuration=org/argouml/resource/info_console.lcf"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.argouml.application.Main"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="argouml-module-dev"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx400M -ea -Dlog4j.configuration=org/argouml/resource/full_console.lcf"/>
</launchConfiguration>
Copied: trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java (from r13644, /trunk/modules/dev/src/org/argouml/uml/diagram/sequence/CallerListNodeBuilder.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java?view=diff&rev=13708&p1=/trunk/modules/dev/src/org/argouml/uml/diagram/sequence/CallerListNodeBuilder.java&p2=trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java&r1=13644&r2=13708
==============================================================================
--- /trunk/modules/dev/src/org/argouml/uml/diagram/sequence/CallerListNodeBuilder.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java 2007-11-03 19:46:20-0700
@@ -22,13 +22,20 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.sequence;
+package org.argouml.dev;
import java.util.Iterator;
import java.util.List;
import javax.swing.tree.DefaultMutableTreeNode;
+import org.argouml.uml.diagram.sequence.MessageNode;
+
+/**
+ * TODO: Add Javadoc
+ *
+ * @author Bob Tarling
+ */
public class CallerListNodeBuilder {
public static void addNodeTree(
Copied: trunk/modules/dev/src/org/argouml/dev/DeveloperModule.java (from r13644, /trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/DeveloperModule.java?view=diff&rev=13708&p1=/trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java&p2=trunk/modules/dev/src/org/argouml/dev/DeveloperModule.java&r1=13644&r2=13708
==============================================================================
--- /trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/DeveloperModule.java 2007-11-03 19:46:20-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2004-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
@@ -22,9 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.ui;
-
-import java.awt.BorderLayout;
+package org.argouml.dev;
import javax.swing.JComponent;
import javax.swing.JMenu;
@@ -32,11 +30,8 @@
import org.apache.log4j.Logger;
import org.argouml.dev.figinspector.FigInspectorPanel;
-import org.argouml.kernel.UndoLogPanel;
-import org.argouml.kernel.UndoManagerWrapper;
-import org.argouml.model.mdr.EventPumpInspectorPanel;
import org.argouml.moduleloader.ModuleInterface;
-import org.argouml.ui.targetmanager.TargetManagerPanel;
+import org.argouml.ui.ProjectBrowser;
import org.tigris.gef.undo.UndoManager;
/**
@@ -87,7 +82,8 @@
JComponent eventPumpPanel = EventPumpInspectorPanel.getInstance();
devPanel.add("Model Listeners", eventPumpPanel);
- ProjectBrowser.getInstance().addPanel(devPanel, BorderLayout.EAST);
+ ProjectBrowser.getInstance().addPanel(devPanel,
+ ProjectBrowser.Position.East);
return true;
}
Copied: trunk/modules/dev/src/org/argouml/dev/EventPumpInspectorPanel.java (from r13644, /trunk/modules/dev/src/org/argouml/model/mdr/EventPumpInspectorPanel.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/EventPumpInspectorPanel.java?view=diff&rev=13708&p1=/trunk/modules/dev/src/org/argouml/model/mdr/EventPumpInspectorPanel.java&p2=trunk/modules/dev/src/org/argouml/dev/EventPumpInspectorPanel.java&r1=13644&r2=13708
==============================================================================
--- /trunk/modules/dev/src/org/argouml/model/mdr/EventPumpInspectorPanel.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/EventPumpInspectorPanel.java 2007-11-03 19:46:20-0700
@@ -1,5 +1,5 @@
-// $Id: FigInspectorPanel.java 11132 2006-09-06 23:29:12Z bobtarling $
-// Copyright (c) 2006 The Regents of the University of California. All
+// $Id: EventPumpInspectorPanel.java 11132 2006-09-06 23:29:12Z bobtarling $
+// 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
@@ -22,14 +22,11 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.model.mdr;
+package org.argouml.dev;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeListener;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.swing.AbstractAction;
import javax.swing.JButton;
@@ -108,48 +105,27 @@
* @return a root tree node
*/
TreeNode getTree() {
- ModelEventPumpMDRImpl mep = (ModelEventPumpMDRImpl) Model.getPump();
- Registry<PropertyChangeListener> elements = mep.getElements();
DefaultMutableTreeNode root =
- new DefaultMutableTreeNode("registry");
- for (Iterator it = elements.registry.entrySet().iterator();
- it.hasNext(); ) {
- Map.Entry entry = (Map.Entry) it.next();
- String item = entry.getKey().toString();
- DefaultMutableTreeNode modelElementNode =
- new DefaultMutableTreeNode(getDescr(item));
- root.add(modelElementNode);
- Map propertyMap = (Map) entry.getValue();
- for (Iterator propertyIterator = propertyMap.entrySet().iterator();
- propertyIterator.hasNext();) {
- Map.Entry propertyEntry = (Map.Entry) propertyIterator.next();
- DefaultMutableTreeNode propertyNode =
- new DefaultMutableTreeNode(propertyEntry.getKey());
- modelElementNode.add(propertyNode);
-
- List listenerList = (List) propertyEntry.getValue();
- for (Iterator listIt = listenerList.iterator();
- listIt.hasNext(); ) {
- Object listener = listIt.next();
- DefaultMutableTreeNode listenerNode =
- new DefaultMutableTreeNode(
- listener.getClass().getName());
- propertyNode.add(listenerNode);
+ new DefaultMutableTreeNode("Event Pump Debug Info");
+ addSubtree(root, Model.getPump().getDebugInfo());
+ return root;
+ }
+
+ private void addSubtree(DefaultMutableTreeNode root, List list) {
+ DefaultMutableTreeNode node = null;
+ for (Object o : list) {
+ if (o instanceof String) {
+ node = new DefaultMutableTreeNode(o);
+ root.add(node);
+ } else if (o instanceof List) {
+ if (node == null) {
+ node = new DefaultMutableTreeNode();
}
+ addSubtree(node, (List) o);
+ } else {
+ throw new IllegalStateException("Unexpected object");
}
}
-
- return root;
}
- private String getDescr(String mofId) {
- ModelEventPumpMDRImpl mep = (ModelEventPumpMDRImpl) Model.getPump();
- Object modelElement = mep.getByMofId(mofId);
- String descr = Model.getFacade().getName(modelElement);
- if (descr != null && descr.trim().length() != 0) {
- return "\"" + descr + "\" - " + modelElement.toString();
- } else {
- return modelElement.toString();
- }
- }
}
Copied: trunk/modules/dev/src/org/argouml/dev/MessageNodeBuilder.java (from r13644, /trunk/modules/dev/src/org/argouml/uml/diagram/sequence/ui/MessageNodeBuilder.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/MessageNodeBuilder.java?view=diff&rev=13708&p1=/trunk/modules/dev/src/org/argouml/uml/diagram/sequence/ui/MessageNodeBuilder.java&p2=trunk/modules/dev/src/org/argouml/dev/MessageNodeBuilder.java&r1=13644&r2=13708
==============================================================================
--- /trunk/modules/dev/src/org/argouml/uml/diagram/sequence/ui/MessageNodeBuilder.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/MessageNodeBuilder.java 2007-11-03 19:46:20-0700
@@ -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
@@ -22,13 +22,19 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.sequence.ui;
+package org.argouml.dev;
import javax.swing.tree.DefaultMutableTreeNode;
-import org.argouml.uml.diagram.sequence.CallerListNodeBuilder;
import org.argouml.uml.diagram.sequence.MessageNode;
+import org.argouml.uml.diagram.sequence.ui.FigClassifierRole;
+import org.argouml.uml.diagram.sequence.ui.FigMessagePort;
+/**
+ * TODO: Add Javadoc
+ *
+ * @author Bob Tarling
+ */
public class MessageNodeBuilder {
public static void addNodeTree(
Copied: trunk/modules/dev/src/org/argouml/dev/TargetManagerPanel.java (from r13644, /trunk/modules/dev/src/org/argouml/ui/targetmanager/TargetManagerPanel.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/TargetManagerPanel.java?view=diff&rev=13708&p1=/trunk/modules/dev/src/org/argouml/ui/targetmanager/TargetManagerPanel.java&p2=trunk/modules/dev/src/org/argouml/dev/TargetManagerPanel.java&r1=13644&r2=13708
==============================================================================
--- /trunk/modules/dev/src/org/argouml/ui/targetmanager/TargetManagerPanel.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/TargetManagerPanel.java 2007-11-03 19:46:20-0700
@@ -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
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.ui.targetmanager;
+package org.argouml.dev;
import java.awt.BorderLayout;
import java.awt.event.ActionEvent;
@@ -39,6 +39,10 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import org.argouml.ui.targetmanager.TargetEvent;
+import org.argouml.ui.targetmanager.TargetListener;
+import org.argouml.ui.targetmanager.TargetManager;
+
/**
* A debug panel for the TargetManager. It shows the actual Targets.
*
@@ -98,7 +102,7 @@
}
}
- /**
+ /*
* @see org.argouml.ui.targetmanager.TargetListener#targetAdded(org.argouml.ui.targetmanager.TargetEvent)
*/
public void targetAdded(TargetEvent e) {
@@ -106,7 +110,7 @@
setTarget(e.getNewTargets());
}
- /**
+ /*
* @see org.argouml.ui.targetmanager.TargetListener#targetRemoved(org.argouml.ui.targetmanager.TargetEvent)
*/
public void targetRemoved(TargetEvent e) {
@@ -114,7 +118,7 @@
setTarget(e.getNewTargets());
}
- /**
+ /*
* @see org.argouml.ui.targetmanager.TargetListener#targetSet(org.argouml.ui.targetmanager.TargetEvent)
*/
public void targetSet(TargetEvent e) {
Copied: trunk/modules/dev/src/org/argouml/dev/UndoLogPanel.java (from r13644, /trunk/modules/dev/src/org/argouml/kernel/UndoLogPanel.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/UndoLogPanel.java?view=diff&rev=13708&p1=/trunk/modules/dev/src/org/argouml/kernel/UndoLogPanel.java&p2=trunk/modules/dev/src/org/argouml/dev/UndoLogPanel.java&r1=13644&r2=13708
==============================================================================
--- /trunk/modules/dev/src/org/argouml/kernel/UndoLogPanel.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/UndoLogPanel.java 2007-11-03 19:46:20-0700
@@ -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
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.kernel;
+package org.argouml.dev;
import java.awt.BorderLayout;
import java.awt.GridLayout;
@@ -31,6 +31,13 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import org.argouml.kernel.Command;
+
+/**
+ * TODO: Add Javadoc
+ *
+ * @author Bob Tarling
+ */
public final class UndoLogPanel extends JScrollPane {
/**
Copied: trunk/modules/dev/src/org/argouml/dev/UndoManagerWrapper.java (from r13644, /trunk/modules/dev/src/org/argouml/kernel/UndoManagerWrapper.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/UndoManagerWrapper.java?view=diff&rev=13708&p1=/trunk/modules/dev/src/org/argouml/kernel/UndoManagerWrapper.java&p2=trunk/modules/dev/src/org/argouml/dev/UndoManagerWrapper.java&r1=13644&r2=13708
==============================================================================
--- /trunk/modules/dev/src/org/argouml/kernel/UndoManagerWrapper.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/UndoManagerWrapper.java 2007-11-03 19:46:20-0700
@@ -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
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.kernel;
+package org.argouml.dev;
/**
* By using this wrapper we are able to show the contents of the Undo stack.
Modified: trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java?view=diff&rev=13708&p1=trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java&p2=trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java&r1=13707&r2=13708
==============================================================================
--- trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java 2007-11-03 19:46:20-0700
@@ -25,14 +25,14 @@
package org.argouml.dev.figinspector;
import java.awt.BorderLayout;
-import java.util.Iterator;
+import java.util.Vector;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.tree.DefaultMutableTreeNode;
+import org.argouml.dev.MessageNodeBuilder;
import org.argouml.uml.diagram.sequence.ui.FigClassifierRole;
-import org.argouml.uml.diagram.sequence.ui.MessageNodeBuilder;
import org.tigris.gef.base.Globals;
import org.tigris.gef.base.Layer;
import org.tigris.gef.event.GraphSelectionEvent;
@@ -137,8 +137,7 @@
addNode(tn, fe.getSourcePortFig());
addNode(tn, fe.getDestFigNode());
addNode(tn, fe.getDestPortFig());
- for (Iterator it = fe.getPathItemFigs().iterator(); it.hasNext(); ) {
- Fig pathFig = (Fig) it.next();
+ for (Fig pathFig : (Vector<Fig>) fe.getPathItemFigs()) {
addNode(tn, pathFig);
}
}
@@ -154,8 +153,13 @@
private String getDescr(Fig f) {
String className = f.getClass().getName();
String descr = className.substring(className.lastIndexOf(".") + 1);
- descr += " bounds=[" + f.getX() + "," + f.getY() + "," + f.getWidth() + "," + f.getHeight() + "]";
- descr += " fill=[" + f.getFillColor().getRed() + "," + f.getFillColor().getGreen() + "," + f.getFillColor().getBlue() + "]";
+ descr +=
+ " bounds=[" + f.getX() + "," + f.getY() + "," + f.getWidth()
+ + "," + f.getHeight() + "]";
+ descr +=
+ " fill=[" + f.getFillColor().getRed() + ","
+ + f.getFillColor().getGreen() + ","
+ + f.getFillColor().getBlue() + "]";
if (f instanceof FigText) {
descr += " \"" + ((FigText) f).getText() + "\"";
}
Modified: trunk/modules/dev/src/org/argouml/dev/figinspector/FigTree.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/figinspector/FigTree.java?view=diff&rev=13708&p1=trunk/modules/dev/src/org/argouml/dev/figinspector/FigTree.java&p2=trunk/modules/dev/src/org/argouml/dev/figinspector/FigTree.java&r1=13707&r2=13708
==============================================================================
--- trunk/modules/dev/src/org/argouml/dev/figinspector/FigTree.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/figinspector/FigTree.java 2007-11-03 19:46:20-0700
@@ -30,6 +30,11 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreePath;
+/**
+ * TODO: Add Javadoc
+ *
+ * @author Bob Tarling
+ */
public class FigTree extends JTree {
/**
@@ -40,7 +45,7 @@
/**
* The Constructor.
*
- * @param fn
+ * @param fn root node of tree
*/
public FigTree(DefaultMutableTreeNode fn) {
super(fn);
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.