Author: rob.stryker(a)jboss.com
Date: 2007-05-23 19:12:56 -0400 (Wed, 23 May 2007)
New Revision: 2066
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/ArchivesModelCore.java
Log:
API duplication removed
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-05-22
17:46:17 UTC (rev 2065)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2007-05-23
23:12:56 UTC (rev 2066)
@@ -190,13 +190,13 @@
return getProjectArchives(project, false, new NullProgressMonitor());
}
public IArchive[] getProjectArchives(IPath project, boolean register, IProgressMonitor
monitor) {
- IArchiveModelNode root = getRoot(project);
+ IArchiveModelNode root = getRoot(project, register, monitor);
if( root != null ) {
- List list = Arrays.asList( getRoot(project).getAllChildren());
+ List list = Arrays.asList( getRoot(project, register, monitor).getAllChildren());
return (IArchive[]) list.toArray(new IArchive[list.size()]);
} else {
registerProject(project, monitor);
- List list = Arrays.asList( getRoot(project).getAllChildren());
+ List list = Arrays.asList( getRoot(project, register, monitor).getAllChildren());
return (IArchive[]) list.toArray(new IArchive[list.size()]);
}
}
@@ -208,6 +208,7 @@
public void registerProject(IPath project, IProgressMonitor monitor) {
// if the file exists, read it in
+ if( monitor == null ) monitor = new NullProgressMonitor();
monitor.beginTask("Loading configuration...",
XMLBinding.NUM_UNMARSHAL_MONITOR_STEPS + 2);
ArchivesCore.getInstance().preRegister(project);
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java 2007-05-22
17:46:17 UTC (rev 2065)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModelCore.java 2007-05-23
23:12:56 UTC (rev 2066)
@@ -58,24 +58,7 @@
}
public static IArchive[] getProjectPackages (IPath project, IProgressMonitor monitor,
boolean forceInit) {
- if (monitor == null) monitor = new NullProgressMonitor();
-
- monitor.beginTask("Fetching packages for \"" + project.lastSegment() +
"\"...", 2);
- IArchive[] packages = ArchivesModel.instance().getProjectArchives(project);
- monitor.worked(1);
-
- if (packages == null) {
- if (forceInit && packageFileExists(project)) {
- ArchivesModel.instance().registerProject(project, monitor);
- packages = ArchivesModel.instance().getProjectArchives(project);
- }
-
- if (packages == null) return new IArchive[0];
- }
-
- monitor.worked(1);
- monitor.done();
- return packages;
+ return ArchivesModel.instance().getProjectArchives(project, forceInit, monitor);
}
public static boolean packageFileExists (IPath project) {
Show replies by date