Changeset 680

Timestamp:

11/22/06 21:42:23 (4 years ago)

Author:

michi

Message:

worked on source abstraction layer

Location:

Jupe

Files:

• src/org/jupe/plugin/JupePlugin.java (modified) (2 diffs)
• src/org/jupe/source/java/AbstractJavaElement.java (added)
• src/org/jupe/source/java/JavaPackage.java (modified) (8 diffs)
• src/org/jupe/source/java/JavaSource.java (modified) (4 diffs)
• unittests/org/jupe/source/java/JavaPackageTest.java (modified) (3 diffs)
• unittests/org/jupe/unittest/AbstractProjectTestCase.java (modified) (5 diffs)

Jupe/src/org/jupe/plugin/JupePlugin.java

@@ -28 +28 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.eclipse.uml2.uml.Model;
@@ -427 +428 @@
                 return null;
         }
-
+        
 }

Jupe/src/org/jupe/source/java/JavaPackage.java

@@ -4 +4 @@
 package org.jupe.source.java;
 
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.ui.refactoring.RenameSupport;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.jupe.plugin.JupePlugin;
+import org.jupe.plugin.exceptions.JupeExceptionLogOnly;
 import org.jupe.source.ISourceClass;
 import org.jupe.source.ISourcePackage;
@@ -10 +17 @@
 /**
  * @author Michael Pradel
- *
+ * 
  */
-public class JavaPackage implements ISourcePackage {
+public class JavaPackage extends AbstractJavaElement implements ISourcePackage {
 
-        /* (non-Javadoc)
+        private String absoluteName;
+
+        protected JavaPackage(JavaSource javaSource, String absoluteName) {
+                super(javaSource);
+                this.absoluteName = absoluteName;
+        }
+
+        /*
+         * (non-Javadoc)
+         * 
          * @see org.jupe.source.ISourcePackage#createClass(java.lang.String)
          */
@@ -22 +38 @@
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see org.jupe.source.ISourcePackage#createInterface(java.lang.String)
          */
@@ -30 +48 @@
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see org.jupe.source.ISourcePackage#createPackage(java.lang.String)
          */
         public ISourcePackage createPackage(String name) {
-                // TODO Auto-generated method stub
-                return null;
+                if (name == null || name.equals("")) {
+                        throw new IllegalArgumentException("name cannot be " + name);
+                }
+
+                StringBuffer newName = new StringBuffer(getPackageFragment()
+                                .getElementName());
+                newName.append(".");
+                newName.append(name);
+                try {
+                        getSourceFolder().createPackageFragment(newName.toString(), true,
+                                        null);
+                } catch (JavaModelException e) {
+                        throw new JupeExceptionLogOnly("problem while creating package "
+                                        + newName.toString() + " in " + " : " + e.toString());
+                }
+                return new JavaPackage(javaSource, newName.toString());
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see org.jupe.source.ISourcePackage#deletePackage(java.lang.String)
          */
@@ -46 +82 @@
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see org.jupe.source.ISourcePackage#deleteType(java.lang.String)
          */
@@ -54 +92 @@
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see org.jupe.source.ISourcePackage#getName()
          */
         public String getName() {
-                // TODO Auto-generated method stub
-                return null;
+                String[] splitted = absoluteName.split("\\.");
+                return splitted[splitted.length - 1];
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see org.jupe.source.ISourcePackage#getPackage(java.lang.String)
          */
@@ -70 +112 @@
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see org.jupe.source.ISourcePackage#getType(java.lang.String)
          */
@@ -78 +122 @@
         }
 
-        /* (non-Javadoc)
+        /*
+         * (non-Javadoc)
+         * 
          * @see org.jupe.source.ISourcePackage#setName(java.lang.String)
          */
         public void setName(String newName) {
-                // TODO Auto-generated method stub
+                if (newName == null || newName.equals("")) {
+                        throw new IllegalArgumentException("name cannot be " + newName);
+                }
 
+                // construct new absolute name
+                String[] splitted = absoluteName.split("\\.");
+                StringBuffer newAbsoluteName = new StringBuffer();
+                for (int i = 0; i < splitted.length - 1; i++) {
+                        String n = splitted[i];
+                        newAbsoluteName.append(n);
+                        newAbsoluteName.append(".");
+                }
+                newAbsoluteName.append(newName);
+
+                // refactor: rename
+                renamePackage(getPackageFragment(), newAbsoluteName.toString());
+                absoluteName = newAbsoluteName.toString();
+        }
+
+        protected IPackageFragment getPackageFragment() {
+                return getSourceFolder().getPackageFragment(absoluteName);
+        }
+
+        // FIXME (Michi) continue here: should not rename package inside this class,
+        // but use instances of JavaPackage
+
+        private void renamePackage(IPackageFragment packageFragment,
+                        String newAbsoluteName) {
+                String oldAbsoluteName = packageFragment.getElementName();
+                // rename package itself
+                try {
+                        RenameSupport renameSupport = RenameSupport.create(
+                                        getPackageFragment(), newAbsoluteName.toString(),
+                                        RenameSupport.UPDATE_GETTER_METHOD
+                                                        & RenameSupport.UPDATE_REFERENCES
+                                                        & RenameSupport.UPDATE_SETTER_METHOD);
+                        IWorkbenchWindow window = JupePlugin.getDefault().getWorkbench()
+                                        .getActiveWorkbenchWindow();
+                        renameSupport.perform(window.getShell(), window);
+                } catch (Exception e) {
+                        throw new JupeExceptionLogOnly("problem while renaming "
+                                        + absoluteName + " to " + newAbsoluteName + ": "
+                                        + e.toString());
+                }
+
+                // recursively rename subpackages
+                try {
+                        IJavaElement[] children = getPackageFragment().getChildren();
+                        for (int i = 0; i < children.length; i++) {
+                                IJavaElement javaElement = children[i];
+                                if (javaElement instanceof IPackageFragment) {
+                                        String oldSubPkgName = javaElement.getElementName();
+                                        String[] splitted = oldSubPkgName.split("\\.");
+                                        StringBuffer newSubPkgName = new StringBuffer(10);
+                                        newSubPkgName.append(newAbsoluteName);
+                                        newSubPkgName.append(splitted[splitted.length - 1]);
+                                        renamePackage((IPackageFragment) javaElement, newSubPkgName
+                                                        .toString());
+                                }
+                        }
+                } catch (JavaModelException e) {
+                        throw new JupeExceptionLogOnly(
+                                        "problem while renaming subpackages of " + oldAbsoluteName
+                                                        + ": " + e.toString());
+                }
         }
 

Jupe/src/org/jupe/source/java/JavaSource.java

@@ -47 +47 @@
 import org.jupe.plugin.exceptions.JupeExceptionLogOnly;
 import org.jupe.source.ISource;
+import org.jupe.source.ISourceClass;
+import org.jupe.source.ISourcePackage;
+import org.jupe.source.ISourceType;
 import org.jupe.synchronisation.SyncBlock;
 
@@ -53 +56 @@
  * 
  */
-public class JavaSource extends JavaPackage implements ISource {
+public class JavaSource extends AbstractJavaElement implements ISource {
 
         public static String javaSourceID = "JavaSource";
@@ -61 +64 @@
         public JavaSource(final IProject project) {
                 this.workspaceProject = project;
+                javaSource = this;
         }
 
@@ -304 +308 @@
         }
 
+        public ISourceClass createClass(String name) {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        public ISourceType createInterface(String name) {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        public ISourcePackage createPackage(String name) {
+                try {
+                        getSourceFolder().createPackageFragment(
+                                        name.toString(), true, null);
+                } catch (JavaModelException e) {
+                        throw new JupeExceptionLogOnly(e, "problem while creating package in default package "
+                                        + name.toString());
+                }
+                return new JavaPackage(javaSource, name);
+        }
+
+        public void deletePackage(String name) {
+                // TODO Auto-generated method stub
+                
+        }
+
+        public void deleteType(String name) {
+                // TODO Auto-generated method stub
+                
+        }
+
+        public ISourcePackage getPackage(String name) {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        public ISourceType getType(String name) {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
 }

Jupe/unittests/org/jupe/source/java/JavaPackageTest.java

@@ -3 +3 @@
  */
 package org.jupe.source.java;
+
+import java.lang.reflect.Method;
 
 import org.eclipse.jdt.core.IPackageFragment;
@@ -26 +28 @@
 
         @Test
-        public void testGetName() {
+        public void testSetName() throws Exception {
                 assertEquals(initialName, sourcePackage.getName());
 
@@ -33 +35 @@
 
                 assertEquals(newName, sourcePackage.getName());
+                
+                // test unexpected arguments
+                Method method = JavaPackage.class.getMethod("setName", new Class[] {String.class});
+                testNullArgument(sourcePackage, method);
+                testWrongArgument(sourcePackage, method, new Object[] {null});
         }
 
         @Test
-        public void testCreatePackage() {
+        public void testCreatePackage() throws Exception {
                 assertNotNull(sourcePackage);
-                IPackageFragment realPkg = getSourceFolder().getPackageFragment(initialName);
+                IPackageFragment realPkg = getSourceFolder().getPackageFragment(
+                                initialName);
                 assertNotNull(realPkg);
                 assertTrue(realPkg.exists());
-                
+
                 // create package in package
                 String innerPkgName = "inner";
                 ISourcePackage innerPkg = sourcePackage.createPackage(innerPkgName);
                 assertNotNull(innerPkg);
-                realPkg = getSourceFolder().getPackageFragment(initialName + "." + innerPkgName);
+                realPkg = getSourceFolder().getPackageFragment(
+                                initialName + "." + innerPkgName);
                 assertNotNull(realPkg);
-                assertTrue(realPkg.exists()); 
+                assertTrue(realPkg.exists());
+
+                // test unusual arguments
+                Method method = JavaPackage.class.getMethod("createPackage",
+                                new Class[] { String.class });
+                testNullArgument(sourcePackage, method);
+                testWrongArgument(sourcePackage, method, new Object[] { "" });
+
+                // try to create package a second time -> should have the same name as
+                // before
+                assertEquals(innerPkg.getName(), sourcePackage.createPackage(
+                                innerPkgName).getName());
                 
-                // FIXME (Michi) continue here...
+                // change name of outer package
+                String newOuterName = "newOuter";
+                sourcePackage.setName(newOuterName);
+                assertEquals(newOuterName, sourcePackage.getName());
+                assertEquals(innerPkgName, innerPkg.getName());
+                realPkg = getSourceFolder().getPackageFragment(newOuterName + "." + innerPkgName);
+                assertNotNull(realPkg);
+                assertTrue(realPkg.exists());
                 
-                // test unusual arguments
-                
-                // create package a second time
-                
+                // change name of inner package
+                innerPkgName = "newInner";
+                innerPkg.setName(innerPkgName);
+                assertEquals(newOuterName, sourcePackage.getName());
+                assertEquals(innerPkgName, innerPkg.getName());
+                realPkg = getSourceFolder().getPackageFragment(newOuterName + "." + innerPkgName);
+                assertNotNull(realPkg);
+                assertTrue(realPkg.exists());
         }
 

Jupe/unittests/org/jupe/unittest/AbstractProjectTestCase.java

@@ -24 +24 @@
 import java.io.File;
 import java.io.FileInputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 import junit.framework.TestCase;
@@ -61 +63 @@
 
         protected UML2ModelFinder modelFinder;
-        
-        private IEditorPart diagramEditor;      
-        
+
+        private IEditorPart diagramEditor;
+
         @Override
         public void setUp() throws Exception {
@@ -77 +79 @@
 
                 IEditorInput editorInput = new FileEditorInput(file);
-                diagramEditor = plugin.getWorkbench()
-                                .getActiveWorkbenchWindow().getActivePage().openEditor(
-                                                editorInput, ClassDiagramEditor.ID);
+                diagramEditor = plugin.getWorkbench().getActiveWorkbenchWindow()
+                                .getActivePage().openEditor(editorInput, ClassDiagramEditor.ID);
 
                 // Is there a more elegant solution?
@@ -101 +102 @@
         public void tearDown() throws Exception {
                 super.tearDown();
-                plugin.getWorkbench()
-                .getActiveWorkbenchWindow().getActivePage().closeEditor(diagramEditor, false);
+                plugin.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+                                .closeEditor(diagramEditor, false);
                 plugin.removeJupeProject(jupeProject);
                 testProject.dispose();
@@ -123 +124 @@
         }
 
+        // FIXME comment
+        protected void testNullArgument(Object object, Method method)
+                        throws Exception {
+                Object[] arguments = new Object[method.getParameterTypes().length];
+                for (int i = 0; i < method.getParameterTypes().length; i++) {
+                        arguments[i] = null;
+                }
+                boolean thrown = false;
+                try {
+                        method.invoke(object, arguments);
+                } catch (InvocationTargetException e) {
+                        if (e.getTargetException() instanceof IllegalArgumentException) {
+                                thrown = true;
+                        }
+                }
+                assertTrue(thrown);
+        }
+
+        // FIXME comment
+        protected void testWrongArgument(Object object, Method method,
+                        Object[] arguments) throws Exception {
+                boolean thrown = false;
+                try {
+                        method.invoke(object, arguments);
+                } catch (InvocationTargetException e) {
+                        if (e.getTargetException() instanceof IllegalArgumentException) {
+                                thrown = true;  
+                        }
+                }
+                assertTrue(thrown);
+        }
+
 }