Author: dgolovin Date: 2007-07-30 13:42:34 -0400 (Mon, 30 Jul 2007) New Revision: 2729 Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java Log: http://jira.jboss.org/jira/browse/EXIN-287 http://jira.jboss.org/jira/browse/EXIN-302 remove dependency from org.jboss.tools.seam.core Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/META-INF/MANIFEST.MF 2007-07-30 17:18:13 UTC (rev 2728) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/META-INF/MANIFEST.MF 2007-07-30 17:42:34 UTC (rev 2729) @@ -16,8 +16,7 @@ org.eclipse.ant.ui, org.eclipse.core.filesystem, org.eclipse.datatools.connectivity, - org.eclipse.datatools.connectivity.db.generic, - org.jboss.tools.seam.core + org.eclipse.datatools.connectivity.db.generic Bundle-ClassPath: org.jboss.ide.seam.gen.jar Export-Package: org.jboss.ide.seam.gen, org.jboss.ide.seam.gen.actions Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java 2007-07-30 17:18:13 UTC (rev 2728) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenPlugin.java 2007-07-30 17:42:34 UTC (rev 2729) @@ -8,15 +8,17 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.ui.preferences.ScopedPreferenceStore; import org.jboss.ide.seam.gen.actions.SeamGenAction; -import org.jboss.tools.seam.core.SeamCorePlugin; -import org.jboss.tools.seam.core.project.facet.SeamFacetPreference; +import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; /** @@ -56,7 +58,9 @@ File buildXmlPath = null; if(config==null) { try { - String seamHome = SeamFacetPreference.getStringPreference(SeamFacetPreference.SEAM_HOME_FOLDER); + Bundle plugin = Platform.getBundle("org.jboss.tools.seam.core"); + if(plugin==null) return; + String seamHome = new ScopedPreferenceStore(new InstanceScope(),plugin.getSymbolicName()).getString("org.jboss.tools.seam.core.project.facet.seamhome"); buildXmlPath = new File(seamHome+File.separator+"seam-gen"+File.separator+"build.xml"); if(buildXmlPath.exists()) SeamGenAction.createSeamgenLaunchConfig(buildXmlPath.getAbsolutePath()); Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java 2007-07-30 17:18:13 UTC (rev 2728) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/SeamGenProperty.java 2007-07-30 17:42:34 UTC (rev 2729) @@ -36,7 +36,7 @@ } public String getDefaultValue(Properties others) { - return null; + return ""; } protected String upper(String name) Modified: trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java =================================================================== --- trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java 2007-07-30 17:18:13 UTC (rev 2728) +++ trunk/seam/plugins/org.jboss.ide.seam.gen/src/org/jboss/ide/seam/gen/actions/SetupDeluxeAction.java 2007-07-30 17:42:34 UTC (rev 2729) @@ -44,8 +44,6 @@ return GENERAL; } } - - ); properties.put( "workspace.home.new", new SeamGenProperty(