Author: rob.stryker(a)jboss.com
Date: 2007-06-08 17:25:35 -0400 (Fri, 08 Jun 2007)
New Revision: 2104
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java
Log:
getRootModules wasn't implemented
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2007-06-08
19:10:35 UTC (rev 2103)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2007-06-08
21:25:35 UTC (rev 2104)
@@ -33,6 +33,7 @@
*/
public void modelChanged(IArchiveNodeDelta delta) {
// if we're not building, get out
+ System.out.println("** model changed");
if(
!ArchivesCore.getInstance().getPreferenceManager().isBuilderEnabled(delta.getPostNode().getProjectPath()))
return;
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2007-06-08
19:10:35 UTC (rev 2103)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2007-06-08
21:25:35 UTC (rev 2104)
@@ -21,14 +21,8 @@
*/
package org.jboss.ide.eclipse.archives.core.model;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -89,6 +83,8 @@
}
+ public static final int LIST_FRONT = 0;
+ public static final int LIST_BACK = -1;
/*
* Listeners
@@ -97,9 +93,17 @@
if( !buildListeners.contains(listener))
buildListeners.add(listener);
}
+ public void addBuildListener(IArchiveBuildListener listener, int loc) {
+ if( !buildListeners.contains(listener)) {
+ if( loc == LIST_FRONT )
+ buildListeners.add(0, listener);
+ else
+ buildListeners.add(listener);
+ }
+ }
+
public void removeBuildListener(IArchiveBuildListener listener) {
- if( buildListeners.contains(listener))
- buildListeners.remove(listener);
+ buildListeners.remove(listener);
}
public IArchiveBuildListener[] getBuildListeners() {
return (IArchiveBuildListener[]) buildListeners.toArray(new
IArchiveBuildListener[buildListeners.size()]);
@@ -109,6 +113,15 @@
if( !modelListeners.contains(listener))
modelListeners.add(listener);
}
+ public void addModelListener(IArchiveModelListener listener, int loc) {
+ if( !modelListeners.contains(listener)) {
+ if( loc == LIST_FRONT )
+ modelListeners.add(0, listener);
+ else
+ modelListeners.add(listener);
+ }
+ }
+
public void removeModelListener(IArchiveModelListener listener) {
if( modelListeners.contains(listener))
modelListeners.remove(listener);
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2007-06-08
19:10:35 UTC (rev 2103)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2007-06-08
21:25:35 UTC (rev 2104)
@@ -97,7 +97,7 @@
public IPath getGlobalSourcePath() {
String path = filesetDelegate.getDir();
if (path == null || path.equals(".") || path.equals("")) {
- return getProjectPath() == null ? null : getProjectPath();
+ return getProjectPath();
} else if( isInWorkspace()){
return ModelUtil.workspacePathToAbsolutePath(new Path(path));
} else {
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2007-06-08
19:10:35 UTC (rev 2103)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2007-06-08
21:25:35 UTC (rev 2104)
@@ -185,7 +185,7 @@
if( absolutePath != null && parameterNode.getNodeType() ==
IArchiveNode.TYPE_ARCHIVE_FILESET ) {
IArchiveFileSet fs = ((IArchiveFileSet)parameterNode);
- IPath sourcePath = fs.isInWorkspace() ?
workspacePathToAbsolutePath(fs.getSourcePath()) : fs.getSourcePath();
+ IPath sourcePath = fs.getGlobalSourcePath();
if( sourcePath.isPrefixOf(absolutePath)) {
lastConcrete =
lastConcrete.append(absolutePath.removeFirstSegments(sourcePath.segmentCount()));
}
@@ -194,8 +194,7 @@
}
- public static IPath workspacePathToAbsolutePath (IPath workspacePath)
- {
+ public static IPath workspacePathToAbsolutePath (IPath workspacePath) {
String projectName = workspacePath.segment(0);
IPath projectPath =
ArchivesCore.getInstance().getVariables().getProjectPath(projectName);
Show replies by date