Author: mvw
Date: 2008-04-30 09:10:03-0700
New Revision: 14531
Added:
trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java
- copied, changed from r14530,
/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ElementPropPanelFactory.java
Removed:
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ElementPropPanelFactory.java
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java
trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java
Log:
This is an improved version of the new PropPanelFactory architecture regarding
dependencies.
Removed:
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ElementPropPanelFactory.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ElementPropPanelFactory.java?view=auto&rev=14530
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java?view=diff&rev=14531&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java&r1=14530&r2=14531
==============================================================================
---
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java
(original)
+++
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/InitDiagramAppearanceUI.java
2008-04-30 09:10:03-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2007 The Regents of the University of California. All
+// Copyright (c) 2007-2008 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,11 +43,9 @@
public class InitDiagramAppearanceUI implements InitSubsystem {
public void init() {
+ /* Set up the property panels for diagrams: */
PropPanelFactory diagramFactory = new DiagramPropPanelFactory();
PropPanelFactoryManager.addPropPanelFactory(diagramFactory);
-
- PropPanelFactory elementFactory = new ElementPropPanelFactory();
- PropPanelFactoryManager.addPropPanelFactory(elementFactory);
}
public List<GUISettingsTabInterface> getProjectSettingsTabs() {
Copied:
trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java (from
r14530,
/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ElementPropPanelFactory.java)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java?view=diff&rev=14531&p1=/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ElementPropPanelFactory.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java&r1=14530&r2=14531
==============================================================================
---
/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ElementPropPanelFactory.java
(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java
2008-04-30 09:10:03-0700
@@ -22,11 +22,9 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.ui;
+package org.argouml.uml.ui;
import org.argouml.model.Model;
-import org.argouml.uml.ui.PropPanel;
-import org.argouml.uml.ui.PropPanelFactory;
import org.argouml.uml.ui.behavior.activity_graphs.PropPanelActionState;
import org.argouml.uml.ui.behavior.activity_graphs.PropPanelActivityGraph;
import org.argouml.uml.ui.behavior.activity_graphs.PropPanelCallState;
@@ -121,7 +119,7 @@
*
* @author Michiel
*/
-public class ElementPropPanelFactory implements PropPanelFactory {
+class ElementPropPanelFactory implements PropPanelFactory {
public PropPanel createPropPanel(Object element) {
if (Model.getFacade().isAElement(element)) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java?view=diff&rev=14531&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java&r1=14530&r2=14531
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/InitUmlUI.java 2008-04-30
09:10:03-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2007 The Regents of the University of California. All
+// Copyright (c) 2007-2008 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,13 +33,16 @@
import org.argouml.application.api.InitSubsystem;
/**
+ * Initialise this subsystem.
*
* @author Michiel
*/
public class InitUmlUI implements InitSubsystem {
public void init() {
- // Do nothing
+ /* Set up the property panels for UML elements: */
+ PropPanelFactory elementFactory = new ElementPropPanelFactory();
+ PropPanelFactoryManager.addPropPanelFactory(elementFactory);
}
public List<AbstractArgoJPanel> getDetailsTabs() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
