svn commit: r15175 - branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel

Author: penyaskito
Date: 2008-07-06 09:14:18-0700
New Revision: 15175

Modified:
   branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/UIFactory.java
   branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/XmlPropertyPanel.java

Log:
Removed hack for resolving the model element names. Use the model metatypes helper instead.

Modified: branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/UIFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/UIFactory.java?view=diff&rev=15175&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/UIFactory.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/UIFactory.java&r1=15174&r2=15175
==============================================================================
--- branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/UIFactory.java	(original)
+++ branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/UIFactory.java	2008-07-06 09:14:18-0700
@@ -39,6 +39,7 @@
 import org.argouml.core.propertypanels.xml.XMLPropertyPanelsDataRecord;
 import org.argouml.core.propertypanels.xml.XMLPropertyPanelsHandler;
 import org.argouml.i18n.Translator;
+import org.argouml.model.Model;
 import org.argouml.uml.ui.ScrollList;
 import org.argouml.uml.ui.UMLCheckBox2;
 import org.argouml.uml.ui.UMLComboBox2;
@@ -389,9 +390,7 @@
 
 
     private String getXMLFileName(Object target) {
-        String classname = target.getClass().getSimpleName();
-        // TODO: I don't like this hack, it may exist a better way.
-        return classname.replace("$Impl", "");
+        return Model.getMetaTypes().getName(target);
     }
 
     private XMLPropertyPanelsData parseXML(String filename) 

Modified: branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/XmlPropertyPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/XmlPropertyPanel.java?view=diff&rev=15175&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/XmlPropertyPanel.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/XmlPropertyPanel.java&r1=15174&r2=15175
==============================================================================
--- branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/XmlPropertyPanel.java	(original)
+++ branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/panel/XmlPropertyPanel.java	2008-07-06 09:14:18-0700
@@ -28,6 +28,7 @@
 import javax.swing.JPanel;
 
 import org.apache.log4j.Logger;
+import org.argouml.model.Model;
 import org.argouml.ui.TabFigTarget;
 import org.argouml.uml.ui.PropPanel;
 
@@ -102,11 +103,7 @@
      * @return the title of the panel, according to the target 
      */
     private String getPanelTitle(Object target) {
-        String classname = target.getClass().getSimpleName();
-        // TODO: I don't like this hack, it may exist a better way.
-        return classname.replace("$Impl", "");
-        // this returns UmlClass for classes, in the original PropPanels
-        // it's Class... Should we change it?
+        return Model.getMetaTypes().getName(target);
     }
    
 }