svn commit: r16181 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module

Author: penyaskito
Date: 2008-11-26 07:46:37-0800
New Revision: 16181

Modified:
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramModule.java

Log:
Use the new DiagramFactoryInterface2 instead of the deprecated DiagramFactoryInterface.



Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java?view=diff&rev=16181&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java&r1=16180&r2=16181
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java	2008-11-26 07:46:37-0800
@@ -24,8 +24,13 @@
 
 package org.argouml.uml.diagram.sequence2.module;
 
+import java.beans.PropertyVetoException;
+
+import org.apache.log4j.Logger;
 import org.argouml.uml.diagram.ArgoDiagram;
 import org.argouml.uml.diagram.DiagramFactoryInterface;
+import org.argouml.uml.diagram.DiagramFactoryInterface2;
+import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.sequence2.ui.UMLSequenceDiagram;
 
 /**
@@ -33,9 +38,15 @@
  * @see org.argouml.uml.diagram.DiagramFactory
  * @author penyaskito
  */
-public class SequenceDiagramFactory implements DiagramFactoryInterface {
+public class SequenceDiagramFactory implements DiagramFactoryInterface, DiagramFactoryInterface2{
 
     /**
+     * Logger.
+     */
+    private static final Logger LOG =
+        Logger.getLogger(SequenceDiagramFactory.class);
+    
+    /**
      * Factory method to create a new instance of an ArgoDiagram,
      * including the sequence2 Sequence Diagram
      * 
@@ -52,4 +63,29 @@
         final ArgoDiagram diagram = new UMLSequenceDiagram(namespace);
         return diagram;            
     }
+
+    /**
+     * Factory method to create a new instance of an ArgoDiagram.
+     * 
+     * @param owner the owning element. This can be the owning namespace for a
+     *            Class diagram or an owning Statemachine for a State Diagram or
+     *            any other interpretation that the diagram type wants to apply.
+     * @param name the name of the diagram. This may be null if the caller would
+     *            like the factory to provide a default name.
+     * @param settings default rendering settings for the diagram
+     * @return the newly instantiated diagram
+     */
+    public ArgoDiagram createDiagram(Object owner, String name,
+            DiagramSettings settings) {
+        final ArgoDiagram diagram = new UMLSequenceDiagram(owner);
+        if (name != null) {
+            try {
+                diagram.setName(name);
+            } catch (PropertyVetoException e) {            
+                LOG.error("Cannot set the name " + name + 
+                        " to the diagram just created: "+ diagram.getName(), e);
+            }
+        }
+        return diagram;  
+    }
 }

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramModule.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramModule.java?view=diff&rev=16181&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramModule.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramModule.java&r1=16180&r2=16181
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramModule.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramModule.java	2008-11-26 07:46:37-0800
@@ -28,6 +28,8 @@
 import org.argouml.moduleloader.ModuleInterface;
 import org.argouml.proppanel.sequence2.SequenceDiagramPropPanelFactory;
 import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.DiagramFactoryInterface;
+import org.argouml.uml.diagram.DiagramFactoryInterface2;
 import org.argouml.uml.diagram.DiagramFactory.DiagramType;
 import org.argouml.uml.ui.PropPanelFactoryManager;
 
@@ -52,9 +54,10 @@
         propPanelFactory =
             new SequenceDiagramPropPanelFactory();
         PropPanelFactoryManager.addPropPanelFactory(propPanelFactory);
-        
+        // TODO: Remove the casting to DiagramFactoryInterface2
+        // as soon as DiagramFactoryInterface is removed.
         DiagramFactory.getInstance().registerDiagramFactory(
-                DiagramType.Sequence, new SequenceDiagramFactory());
+                DiagramType.Sequence, (DiagramFactoryInterface2) new SequenceDiagramFactory());
 
         LOG.info("SequenceDiagram Module enabled.");
         return true;
@@ -64,8 +67,10 @@
 
         PropPanelFactoryManager.removePropPanelFactory(propPanelFactory);
 
+        // TODO: Remove the casting to DiagramFactoryInterface2
+        // as soon as DiagramFactoryInterface is removed.
         DiagramFactory.getInstance().registerDiagramFactory(
-                DiagramType.Sequence, (SequenceDiagramFactory) null);
+                DiagramType.Sequence, (DiagramFactoryInterface2) null);
 
         LOG.info("SequenceDiagram Module disabled.");
         return true;