move JptLibraryProviderInstallOperationConfig interface to the public API package, appears to have belonged there all along.

8 files changed, 25 insertions, 43 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JpaLibraryProviderInstallOperationConfig.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JpaLibraryProviderInstallOperationConfig.java
index d8e252be15..7efbd0b8c7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JpaLibraryProviderInstallOperationConfig.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JpaLibraryProviderInstallOperationConfig.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
+ *  Copyright (c) 2010, 2011  Oracle. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0, which accompanies this distribution
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -9,6 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.core.internal.libprov;
 
+import org.eclipse.jpt.core.libval.JptLibraryProviderInstallOperationConfig;
 import org.eclipse.jpt.core.platform.JpaPlatformDescription;
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptLibraryProviderInstallOperationConfig.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptLibraryProviderInstallOperationConfig.java
deleted file mode 100644
index f1861e8a3a..0000000000
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptLibraryProviderInstallOperationConfig.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
- *  This program and the accompanying materials are made available under the
- *  terms of the Eclipse Public License v1.0, which accompanies this distribution
- *  and is available at http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jpt.core.internal.libprov;
-
-import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-
-public interface JptLibraryProviderInstallOperationConfig {
-	
-	ILibraryProvider getLibraryProvider();
-	
-	IProjectFacetVersion getProjectFacetVersion();
-}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptOsgiBundlesLibraryProviderInstallOperationConfig.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptOsgiBundlesLibraryProviderInstallOperationConfig.java
index 7eb37cd380..fa0468c030 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptOsgiBundlesLibraryProviderInstallOperationConfig.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptOsgiBundlesLibraryProviderInstallOperationConfig.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
+ *  Copyright (c) 2010, 2011 Oracle. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0, which accompanies this distribution
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -12,6 +12,7 @@ package org.eclipse.jpt.core.internal.libprov;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.libval.JptLibraryProviderInstallOperationConfig;
 import org.eclipse.jpt.core.libval.LibraryValidator;
 import org.eclipse.jst.j2ee.internal.common.classpath.WtpOsgiBundlesLibraryProviderInstallOperationConfig;
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptUserLibraryProviderInstallOperationConfig.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptUserLibraryProviderInstallOperationConfig.java
index e47a5da942..2e01325426 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptUserLibraryProviderInstallOperationConfig.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libprov/JptUserLibraryProviderInstallOperationConfig.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
+ *  Copyright (c) 2010, 2011 Oracle. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0, which accompanies this distribution
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -12,6 +12,7 @@ package org.eclipse.jpt.core.internal.libprov;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.libval.JptLibraryProviderInstallOperationConfig;
 import org.eclipse.jpt.core.libval.LibraryValidator;
 import org.eclipse.jst.j2ee.internal.common.classpath.WtpUserLibraryProviderInstallOperationConfig;
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/GenericEclipseLinkBundlesLibraryValidator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/GenericEclipseLinkBundlesLibraryValidator.java
index 9f09cecf35..0be3dc8ba7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/GenericEclipseLinkBundlesLibraryValidator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/GenericEclipseLinkBundlesLibraryValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
+ *  Copyright (c) 2010, 2011  Oracle. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0, which accompanies this distribution
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -14,7 +14,7 @@ import java.util.Map;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jpt.core.JpaFacet;
 import org.eclipse.jpt.core.internal.libprov.JpaOsgiBundlesLibraryProviderInstallOperationConfig;
-import org.eclipse.jpt.core.internal.libprov.JptLibraryProviderInstallOperationConfig;
+import org.eclipse.jpt.core.libval.JptLibraryProviderInstallOperationConfig;
 import org.eclipse.osgi.service.resolver.VersionRange;
 
 public class GenericEclipseLinkBundlesLibraryValidator 
@@ -24,13 +24,13 @@ public class GenericEclipseLinkBundlesLibraryValidator
 		JpaOsgiBundlesLibraryProviderInstallOperationConfig jpaConfig 
 				= (JpaOsgiBundlesLibraryProviderInstallOperationConfig) config;
 		Map<String, VersionRange[]> bundleVersionRanges = new HashMap<String, VersionRange[]>();
-		String bundleName = "javax.persistence";
+		String bundleName = "javax.persistence"; //$NON-NLS-1$
 		VersionRange[] versionRanges = new VersionRange[0];
 		if (config.getProjectFacetVersion().equals(JpaFacet.VERSION_1_0)) {
-			versionRanges = new VersionRange[] {new VersionRange("[1.0, 3.0)")};
+			versionRanges = new VersionRange[] {new VersionRange("[1.0, 3.0)")}; //$NON-NLS-1$
 		}
 		else if (config.getProjectFacetVersion().equals(JpaFacet.VERSION_2_0)) {
-			versionRanges = new VersionRange[] {new VersionRange("[2.0, 3.0)")};
+			versionRanges = new VersionRange[] {new VersionRange("[2.0, 3.0)")}; //$NON-NLS-1$
 		}
 		bundleVersionRanges.put(bundleName, versionRanges);
 		return validate(jpaConfig, bundleVersionRanges);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/GenericJpaUserLibraryValidator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/GenericJpaUserLibraryValidator.java
index 3a8813b223..e11f8ac674 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/GenericJpaUserLibraryValidator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/GenericJpaUserLibraryValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
+ *  Copyright (c) 2010, 2011 Oracle. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0, which accompanies this distribution
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -25,7 +25,7 @@ import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jpt.core.JpaFacet;
 import org.eclipse.jpt.core.internal.JptCoreMessages;
 import org.eclipse.jpt.core.internal.libprov.JpaUserLibraryProviderInstallOperationConfig;
-import org.eclipse.jpt.core.internal.libprov.JptLibraryProviderInstallOperationConfig;
+import org.eclipse.jpt.core.libval.JptLibraryProviderInstallOperationConfig;
 import org.eclipse.jpt.core.libval.LibraryValidator;
 import org.eclipse.osgi.util.NLS;
 
@@ -36,9 +36,9 @@ public class GenericJpaUserLibraryValidator
 		JpaUserLibraryProviderInstallOperationConfig jpaConfig 
 				= (JpaUserLibraryProviderInstallOperationConfig) config;
 		Set<String> classNames = new HashSet<String>();
-		classNames.add("javax.persistence.Entity");
+		classNames.add("javax.persistence.Entity"); //$NON-NLS-1$
 		if (config.getProjectFacetVersion().compareTo(JpaFacet.VERSION_2_0) >= 0) {
-			classNames.add("javax.persistence.ElementCollection");
+			classNames.add("javax.persistence.ElementCollection"); //$NON-NLS-1$
 		}
 		return validate(jpaConfig, classNames);
 	}
@@ -49,7 +49,7 @@ public class GenericJpaUserLibraryValidator
 		Set<String> classFileNames = new HashSet<String>();
 		Map<String,String> classFileNameToClassName = new HashMap<String,String>();
 		for (String className : classNames) {
-			String classFileName = className.replace('.', '/') + ".class";
+			String classFileName = className.replace('.', '/') + ".class"; //$NON-NLS-1$
 			classFileNames.add(classFileName);
 			classFileNameToClassName.put(classFileName, className);
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorConfig.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorConfig.java
index 979becf9ad..3b2d5ac291 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorConfig.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorConfig.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
+ *  Copyright (c) 2010, 2011  Oracle. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0, which accompanies this distribution
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -15,7 +15,7 @@ import org.eclipse.core.expressions.EvaluationResult;
 import org.eclipse.core.expressions.Expression;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jpt.core.internal.XPointUtil;
-import org.eclipse.jpt.core.internal.libprov.JptLibraryProviderInstallOperationConfig;
+import org.eclipse.jpt.core.libval.JptLibraryProviderInstallOperationConfig;
 import org.eclipse.jpt.core.libval.LibraryValidator;
 
 public class LibraryValidatorConfig {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorManager.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorManager.java
index 098bf71d21..38059b3c3e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorManager.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/libval/LibraryValidatorManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2010  Oracle. All rights reserved.
+ *  Copyright (c) 2010, 2011  Oracle. All rights reserved.
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v1.0, which accompanies this distribution
  *  and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.internal.XPointUtil.XPointException;
-import org.eclipse.jpt.core.internal.libprov.JptLibraryProviderInstallOperationConfig;
+import org.eclipse.jpt.core.libval.JptLibraryProviderInstallOperationConfig;
 import org.eclipse.jpt.core.libval.LibraryValidator;
 import org.eclipse.jpt.utility.internal.KeyedSet;
 import org.eclipse.jpt.utility.internal.iterables.FilteringIterable;
@@ -30,12 +30,12 @@ import org.eclipse.jpt.utility.internal.iterables.TransformationIterable;
 
 public class LibraryValidatorManager {
 	
-	public static final String EXTENSION_POINT_ID = "libraryValidators";
+	public static final String EXTENSION_POINT_ID = "libraryValidators"; //$NON-NLS-1$
 	public static final String QUALIFIED_EXTENSION_POINT_ID = JptCorePlugin.PLUGIN_ID_ + EXTENSION_POINT_ID;
-	public static final String LIBRARY_VALIDATOR_ELEMENT = "libraryValidator";
-	public static final String ID_ATTRIBUTE = "id";
-	public static final String CLASS_ATTRIBUTE = "class";
-	public static final String ENABLEMENT_ELEMENT = "enablement";
+	public static final String LIBRARY_VALIDATOR_ELEMENT = "libraryValidator"; //$NON-NLS-1$
+	public static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$
+	public static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+	public static final String ENABLEMENT_ELEMENT = "enablement"; //$NON-NLS-1$
 	
 	
 	private static LibraryValidatorManager INSTANCE = new LibraryValidatorManager();