[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal ...
Marshall Culpepper
mculpepper at jboss.com
Wed Feb 28 18:21:11 EST 2007
User: mculpepper
Date: 07/02/28 18:21:11
Modified: core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal
PackageReferenceImpl.java PackageImpl.java
PackageNodeImpl.java PackageFolderImpl.java
Log:
refactored common "getPackageRelativePath" function into PackagesCore (being used from 3 different node types)
Revision Changes Path
1.5 +2 -1 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageReferenceImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageReferenceImpl.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageReferenceImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PackageReferenceImpl.java 15 Feb 2007 22:48:28 -0000 1.4
+++ PackageReferenceImpl.java 28 Feb 2007 23:21:11 -0000 1.5
@@ -13,6 +13,7 @@
import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
import org.jboss.ide.eclipse.packages.core.model.IPackageNodeVisitor;
import org.jboss.ide.eclipse.packages.core.model.IPackageReference;
+import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackage;
import org.jboss.ide.eclipse.packages.core.model.types.IPackageType;
@@ -161,7 +162,7 @@
}
public IPath getPackageRelativePath() {
- return pkg.getPackageRelativePath();
+ return PackagesCore.getPackageRelativePath(this);
}
public IPackage[] getPackages() {
1.18 +5 -31 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageImpl.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- PackageImpl.java 23 Feb 2007 21:43:30 -0000 1.17
+++ PackageImpl.java 28 Feb 2007 23:21:11 -0000 1.18
@@ -32,6 +32,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.jboss.ide.eclipse.core.util.ProjectUtil;
import org.jboss.ide.eclipse.core.util.ResourceUtil;
import org.jboss.ide.eclipse.packages.core.ExtensionManager;
import org.jboss.ide.eclipse.packages.core.model.IPackage;
@@ -47,7 +48,7 @@
* A Package.
*
* @author <a href="marshall at jboss.org">Marshall Culpepper</a>
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*/
public class PackageImpl extends PackageNodeImpl implements IPackage {
@@ -83,14 +84,10 @@
}
public IPath getDestinationPath () {
- String path = packageDelegate.getToDir();
- if (path == null) {
- if (project != null) {
- return project.getFullPath();
- } else return null;
- }
+ if (packageDelegate.getToDir() == null || packageDelegate.getToDir().equals("."))
+ return ProjectUtil.getProjectLocation(project);
- return new Path(path);
+ else return new Path(packageDelegate.getToDir());
}
public IPackageFileSet[] getFileSets() {
@@ -220,29 +217,6 @@
packageDelegate.setPackageType(type.getId());
}
- public IPath getPackageRelativePath() {
- if (getParent() == null) return null;
-
- String path = new String(getName());
-
- IPackageNode parent = getParent(), save = null;
- while (true) {
- if (parent.getNodeType() == IPackageNode.TYPE_PACKAGE)
- path = ((IPackage)parent).getName() + "/" + path;
- else
- path = ((IPackageFolder)parent).getName() + "/" + path;
-
- save = parent;
- parent = parent.getParent();
- if (parent == null) {
- parent = save;
- break;
- }
- }
-
- return new Path(path);
- }
-
public IPackageReference createReference (boolean topLevel) {
PackageReferenceImpl ref = new PackageReferenceImpl(this, new XbPackage());
1.10 +6 -0 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageNodeImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageNodeImpl.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageNodeImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- PackageNodeImpl.java 21 Feb 2007 20:03:38 -0000 1.9
+++ PackageNodeImpl.java 28 Feb 2007 23:21:11 -0000 1.10
@@ -27,9 +27,11 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.IPath;
import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
import org.jboss.ide.eclipse.packages.core.model.IPackageNodeVisitor;
import org.jboss.ide.eclipse.packages.core.model.IPackageReference;
+import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbFileSet;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbFolder;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackage;
@@ -133,6 +135,10 @@
}
}
+ public IPath getPackageRelativePath() {
+ return PackagesCore.getPackageRelativePath(this);
+ }
+
public IProject getProject() {
return project;
}
1.5 +2 -25 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageFolderImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageFolderImpl.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageFolderImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PackageFolderImpl.java 20 Dec 2006 19:56:40 -0000 1.4
+++ PackageFolderImpl.java 28 Feb 2007 23:21:11 -0000 1.5
@@ -22,8 +22,6 @@
package org.jboss.ide.eclipse.packages.core.model.internal;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
import org.jboss.ide.eclipse.packages.core.model.IPackage;
import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
import org.jboss.ide.eclipse.packages.core.model.IPackageFolder;
@@ -34,7 +32,7 @@
* A PackageFolderImpl.
*
* @author <a href="marshall at jboss.org">Marshall Culpepper</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class PackageFolderImpl extends PackageNodeImpl implements
IPackageFolder {
@@ -92,27 +90,6 @@
folderDelegate.setName(name);
}
- public IPath getPackageRelativePath() {
- String path = new String(getName());
-
- IPackageNode parent = getParent(), save = null;
- while (true) {
- if (parent.getNodeType() == IPackageNode.TYPE_PACKAGE)
- path = ((IPackage)parent).getName() + "/" + path;
- else
- path = ((IPackageFolder)parent).getName() + "/" + path;
-
- save = parent;
- parent = parent.getParent();
- if (parent == null) {
- parent = save;
- break;
- }
- }
-
- return new Path(path);
- }
-
protected XbFolder getFolderDelegate ()
{
return folderDelegate;
More information about the jboss-cvs-commits
mailing list