Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsrinivasan2008-02-19 19:55:33 +0000
committerrsrinivasan2008-02-19 19:55:33 +0000
commit2aa24d9d69d7a70216867d5ec6dadfc9d243e950 (patch)
treef36ee2f191a4369cfe89a235fc4690123d20be90
parente4e2c4f698df7a397eae541c7513748a02a11172 (diff)
downloadwebtools.jsf-2aa24d9d69d7a70216867d5ec6dadfc9d243e950.tar.gz
webtools.jsf-2aa24d9d69d7a70216867d5ec6dadfc9d243e950.tar.xz
webtools.jsf-2aa24d9d69d7a70216867d5ec6dadfc9d243e950.zip
[219484] Reverting code to the released version. These changes were not released. They are not showstopper bugs and hence didn’t come for PMC approval.
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java14
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java1
2 files changed, 5 insertions, 10 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java
index e034c9d11..1c7b7db85 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java
@@ -261,9 +261,6 @@ public class JSFFacetInstallDataModelProvider extends
private IProject getProject(){
String projName = (String)getProperty(FACET_PROJECT_NAME);
- if (projName == null || "".equals(projName))
- return null;
-
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
return project;
}
@@ -288,14 +285,13 @@ public class JSFFacetInstallDataModelProvider extends
return OK_STATUS;
}
- private IPath getProjectPath() {
- IProject project = getProject();
- if (project == null)
- return null;
- else if (project.exists())
+ private IPath getProjectPath() {
+ String projName = (String)getProperty(FACET_PROJECT_NAME);
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
+ if (project.exists()){
return project.getLocation();
+ }
- String projName = (String)getProperty(FACET_PROJECT_NAME);
IDataModel projModel = (IDataModel)getProperty(MASTER_PROJECT_DM);
if (projModel.getBooleanProperty(IProjectCreationPropertiesNew.USE_DEFAULT_LOCATION)){
return new Path(projModel.getStringProperty(IProjectCreationPropertiesNew.PROJECT_LOCATION)).append(projName);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java
index 34835010a..eea8207be 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java
@@ -95,7 +95,6 @@ public class ImplicitRuntimeJSFAppConfigProvider extends AbstractJSFAppConfigPro
components.add(createUIComponent("Input")); //$NON-NLS-1$
components.add(createUIComponent("Message")); //$NON-NLS-1$
components.add(createUIComponent("Messages")); //$NON-NLS-1$
- components.add(createUIComponent("NamingContainer")); //$NON-NLS-1$
components.add(createUIComponent("Output")); //$NON-NLS-1$
components.add(createUIComponent("Panel")); //$NON-NLS-1$
components.add(createUIComponent("Parameter")); //$NON-NLS-1$

Back to the top