Misc. bug fixes.
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/LibraryFacetInstallConfig.java b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/LibraryFacetInstallConfig.java
index 89c80fe..a350481 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/LibraryFacetInstallConfig.java
+++ b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/LibraryFacetInstallConfig.java
@@ -11,6 +11,8 @@
package org.eclipse.jst.common.project.facet.core.libprov;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.wst.common.project.facet.core.ActionConfig;
import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
@@ -47,6 +49,19 @@
init();
}
+ @Override
+ public IStatus validate()
+ {
+ if( this.libraryInstallDelegate != null )
+ {
+ return this.libraryInstallDelegate.validate();
+ }
+ else
+ {
+ return Status.OK_STATUS;
+ }
+ }
+
private void init()
{
final IFacetedProjectWorkingCopy fpjwc = getFacetedProjectWorkingCopy();
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/LibraryFacetUninstallConfig.java b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/LibraryFacetUninstallConfig.java
index 9781865..02d3718 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/LibraryFacetUninstallConfig.java
+++ b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/LibraryFacetUninstallConfig.java
@@ -11,6 +11,8 @@
package org.eclipse.jst.common.project.facet.core.libprov;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.wst.common.project.facet.core.ActionConfig;
import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
@@ -47,6 +49,19 @@
init();
}
+ @Override
+ public IStatus validate()
+ {
+ if( this.libraryUninstallDelegate != null )
+ {
+ return this.libraryUninstallDelegate.validate();
+ }
+ else
+ {
+ return Status.OK_STATUS;
+ }
+ }
+
private void init()
{
final IFacetedProjectWorkingCopy fpjwc = getFacetedProjectWorkingCopy();
diff --git a/plugins/org.eclipse.jst.common.project.facet.ui/src/org/eclipse/jst/common/project/facet/ui/libprov/LibraryFacetInstallPage.java b/plugins/org.eclipse.jst.common.project.facet.ui/src/org/eclipse/jst/common/project/facet/ui/libprov/LibraryFacetInstallPage.java
index 0c22b40..9fbb3b6 100644
--- a/plugins/org.eclipse.jst.common.project.facet.ui/src/org/eclipse/jst/common/project/facet/ui/libprov/LibraryFacetInstallPage.java
+++ b/plugins/org.eclipse.jst.common.project.facet.ui/src/org/eclipse/jst/common/project/facet/ui/libprov/LibraryFacetInstallPage.java
@@ -166,11 +166,11 @@
protected IStatus performValidation()
{
- if( this.libraryInstallDelegate != null )
+ if( this.config != null )
{
- return this.libraryInstallDelegate.validate();
+ return this.config.validate();
}
-
+
return Status.OK_STATUS;
}
