Author: rob.stryker(a)jboss.com
Date: 2007-05-22 11:01:59 -0400 (Tue, 22 May 2007)
New Revision: 2058
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/StandaloneArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java
Log:
Add nature moved to eclipse-specific code
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2007-05-22
14:54:49 UTC (rev 2057)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2007-05-22
15:01:59 UTC (rev 2058)
@@ -28,6 +28,5 @@
org.jboss.ide.eclipse.archives.core.model.internal.xb;x-friends:="org.jboss.ide.eclipse.archives.test",
org.jboss.ide.eclipse.archives.core.model.other,
org.jboss.ide.eclipse.archives.core.model.other.internal;x-friends:="org.jboss.ide.eclipse.archives.test",
-
org.jboss.ide.eclipse.archives.core.project;x-friends:="org.jboss.ide.eclipse.archives.test",
org.jboss.ide.eclipse.archives.core.util;x-friends:="org.jboss.ide.eclipse.archives.test",
org.jboss.ide.eclipse.archives.core.util.internal;x-friends:="org.jboss.ide.eclipse.archives.test"
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2007-05-22
14:54:49 UTC (rev 2057)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2007-05-22
15:01:59 UTC (rev 2058)
@@ -2,6 +2,7 @@
+import org.eclipse.core.runtime.IPath;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.other.IExtensionManager;
import org.jboss.ide.eclipse.archives.core.model.other.IPreferenceManager;
@@ -9,6 +10,7 @@
import
org.jboss.ide.eclipse.archives.core.model.other.internal.WorkspaceExtensionManager;
import
org.jboss.ide.eclipse.archives.core.model.other.internal.WorkspacePreferenceManager;
import org.jboss.ide.eclipse.archives.core.model.other.internal.WorkspaceVariables;
+import org.jboss.ide.eclipse.archives.core.project.ProjectUtils;
public class WorkspaceArchivesCore extends ArchivesCore {
@@ -28,4 +30,9 @@
protected IRuntimeVariables createVariables() {
return new WorkspaceVariables();
}
+
+ public void preRegister(IPath project) {
+ ProjectUtils.addProjectNature(project);
+ }
+
}
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2007-05-22
14:54:49 UTC (rev 2057)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2007-05-22
15:01:59 UTC (rev 2058)
@@ -1,5 +1,6 @@
package org.jboss.ide.eclipse.archives.core;
+import org.eclipse.core.runtime.IPath;
import org.jboss.ide.eclipse.archives.core.model.other.IExtensionManager;
import org.jboss.ide.eclipse.archives.core.model.other.IPreferenceManager;
import org.jboss.ide.eclipse.archives.core.model.other.IRuntimeVariables;
@@ -47,4 +48,6 @@
public IPreferenceManager getPreferenceManager() {
return preferenceManager;
}
+
+ public abstract void preRegister(IPath project);
}
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/StandaloneArchivesCore.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/StandaloneArchivesCore.java 2007-05-22
14:54:49 UTC (rev 2057)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/StandaloneArchivesCore.java 2007-05-22
15:01:59 UTC (rev 2058)
@@ -1,5 +1,6 @@
package org.jboss.ide.eclipse.archives.core;
+import org.eclipse.core.runtime.IPath;
import org.jboss.ide.eclipse.archives.core.model.other.IExtensionManager;
import org.jboss.ide.eclipse.archives.core.model.other.IPreferenceManager;
import org.jboss.ide.eclipse.archives.core.model.other.IRuntimeVariables;
@@ -26,4 +27,7 @@
return new StandaloneVariables();
}
+ public void preRegister(IPath project) {
+
+ }
}
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
14:54:49 UTC (rev 2057)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2007-05-22
15:01:59 UTC (rev 2058)
@@ -55,7 +55,6 @@
import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackages;
import org.jboss.ide.eclipse.archives.core.model.other.IArchiveBuildListener;
import org.jboss.ide.eclipse.archives.core.model.other.IArchiveModelListener;
-import org.jboss.ide.eclipse.archives.core.project.ProjectUtils;
/**
* The root model which keeps track of registered projects
@@ -209,20 +208,12 @@
return archivesRoot.containsValue(node);
}
- private void addNature(IPath project) {
- try {
- ProjectUtils.addProjectNature(project);
- } catch(Exception e) {
- }
- }
public void registerProject(IPath project, IProgressMonitor monitor) {
// if the file exists, read it in
monitor.beginTask("Loading configuration...",
XMLBinding.NUM_UNMARSHAL_MONITOR_STEPS + 2);
-
- if( ArchivesCore.getInstance().isWorkspaceRuntype()) {
- addNature(project);
- }
+ ArchivesCore.getInstance().preRegister(project);
+
ArchiveModelNode root;
IPath packagesFile = project.append(PROJECT_PACKAGES_FILE);
if (packagesFile.toFile().exists())
Show replies by date