svn commit: r13356 - branches/gsoc2007/maurelio1234/examples/javabeans: . src/org/argouml/uml/profile/javabeans

Author: maurelio1234
Date: 2007-08-14 15:29:30-0700
New Revision: 13356

Modified:
   branches/gsoc2007/maurelio1234/examples/javabeans/.classpath
   branches/gsoc2007/maurelio1234/examples/javabeans/src/org/argouml/uml/profile/javabeans/ProfileJavaBeans.java

Log:
moving default types definition to the profiles

Modified: branches/gsoc2007/maurelio1234/examples/javabeans/.classpath
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/examples/javabeans/.classpath?view=diff&rev=13356&p1=branches/gsoc2007/maurelio1234/examples/javabeans/.classpath&p2=branches/gsoc2007/maurelio1234/examples/javabeans/.classpath&r1=13355&r2=13356
==============================================================================
--- branches/gsoc2007/maurelio1234/examples/javabeans/.classpath	(original)
+++ branches/gsoc2007/maurelio1234/examples/javabeans/.classpath	2007-08-14 15:29:30-0700
@@ -2,9 +2,9 @@
 <classpath>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

-	<classpathentry combineaccessrules="false" kind="src" path="/argouml"/>

 	<classpathentry combineaccessrules="false" kind="src" path="/argouml-core-model"/>

 	<classpathentry kind="lib" path="/argouml-core-lib/gef-0.12.4M4.jar"/>

 	<classpathentry kind="lib" path="/argouml-core-lib/log4j-1.2.6.jar"/>

+	<classpathentry combineaccessrules="false" kind="src" path="/argouml_branch"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>


Modified: branches/gsoc2007/maurelio1234/examples/javabeans/src/org/argouml/uml/profile/javabeans/ProfileJavaBeans.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/examples/javabeans/src/org/argouml/uml/profile/javabeans/ProfileJavaBeans.java?view=diff&rev=13356&p1=branches/gsoc2007/maurelio1234/examples/javabeans/src/org/argouml/uml/profile/javabeans/ProfileJavaBeans.java&p2=branches/gsoc2007/maurelio1234/examples/javabeans/src/org/argouml/uml/profile/javabeans/ProfileJavaBeans.java&r1=13355&r2=13356
==============================================================================
--- branches/gsoc2007/maurelio1234/examples/javabeans/src/org/argouml/uml/profile/javabeans/ProfileJavaBeans.java	(original)
+++ branches/gsoc2007/maurelio1234/examples/javabeans/src/org/argouml/uml/profile/javabeans/ProfileJavaBeans.java	2007-08-14 15:29:30-0700
@@ -29,33 +29,33 @@
 

 import org.argouml.model.Model;

 import org.argouml.uml.profile.FigNodeStrategy;

-import org.argouml.uml.profile.FormatingStrategy;

 import org.argouml.uml.profile.Profile;

 import org.argouml.uml.profile.ProfileException;

 import org.argouml.uml.profile.ProfileJava;

 import org.argouml.uml.profile.ProfileModelLoader;

 import org.argouml.uml.profile.ResourceModelLoader;

 

+@SuppressWarnings("unchecked")

 public class ProfileJavaBeans extends Profile {

 

-    private static ProfileJavaBeans instance = null;

-    

-    private ProfileModelLoader profileModelLoader;

-    private Collection model;

-    private FigNodeStrategy figStrategy = new JavaBeansFigNodeStrategy();

-

-    private ProfileJavaBeans() throws ProfileException {

-	    profileModelLoader = new ResourceModelLoader(this.getClass());

-	    model = profileModelLoader.loadModel("JavaBeans.xmi");	

-	    

-        if (model == null) {

-            model = new ArrayList();

-            model.add(Model.getModelManagementFactory().createModel());

-        }

+	private static ProfileJavaBeans instance = null;

+

+	private ProfileModelLoader profileModelLoader;

+	private Collection model;

+	private FigNodeStrategy figStrategy = new JavaBeansFigNodeStrategy();

+

+	private ProfileJavaBeans() throws ProfileException {

+		profileModelLoader = new ResourceModelLoader(this.getClass());

+		model = profileModelLoader.loadModel("JavaBeans.xmi");

+

+		if (model == null) {

+			model = new ArrayList();

+			model.add(Model.getModelManagementFactory().createModel());

+		}

 		addProfileDependency(ProfileJava.getInstance());

-    }

+	}

 

-    public static ProfileJavaBeans getInstance() {

+	public static ProfileJavaBeans getInstance() {

 		if (instance == null) {

 			try {

 				instance = new ProfileJavaBeans();

@@ -66,22 +66,18 @@
 		}

 		return instance;

 	}

-    

-    public FormatingStrategy getFormatingStrategy() {

-	return null;

-    }

-

-    public Object getModel() {

-    	return model;

-    }

-

-    public String getDisplayName() {

-	return "JavaBeans";

-    }

-

-    public FigNodeStrategy getFigureStrategy() {	

-	return figStrategy;

-    }

+

+	public Object getModel() {

+		return model;

+	}

+

+	public String getDisplayName() {

+		return "JavaBeans";

+	}

+

+	public FigNodeStrategy getFigureStrategy() {

+		return figStrategy;

+	}

 

 	@Override

 	public Collection getProfilePackages() throws ProfileException {