From 9f11823b26419656cc5bffe122bc542652326836 Mon Sep 17 00:00:00 2001
From: David Dykstal <david_dykstal@us.ibm.com>
Date: Wed, 7 Jun 2006 20:36:44 +0000
Subject: [PATCH] Make persistence provider implementations internal.

---
 .../{ => internal}/persistence/PropertyFileProvider.java  | 3 ++-
 .../{ => internal}/persistence/SerializingProvider.java   | 3 ++-
 .../rse/internal/persistence/dom/RSEDOMImporter.java      | 8 +++-----
 rse/plugins/org.eclipse.rse.ui/plugin.xml                 | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/{ => internal}/persistence/PropertyFileProvider.java (99%)
 rename rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/{ => internal}/persistence/SerializingProvider.java (97%)

diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/PropertyFileProvider.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
similarity index 99%
rename from rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/PropertyFileProvider.java
rename to rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
index feb4a1a79f6..ec445429482 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/PropertyFileProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
@@ -11,7 +11,7 @@
  * Contributors:
  * {Name} (company) - description of contribution.
  ********************************************************************************/
-package org.eclipse.rse.persistence;
+package org.eclipse.rse.internal.persistence;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -39,6 +39,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.rse.core.SystemResourceManager;
+import org.eclipse.rse.persistence.IRSEPersistenceProvider;
 import org.eclipse.rse.persistence.dom.IRSEDOMConstants;
 import org.eclipse.rse.persistence.dom.RSEDOM;
 import org.eclipse.rse.persistence.dom.RSEDOMNode;
diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/SerializingProvider.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java
similarity index 97%
rename from rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/SerializingProvider.java
rename to rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java
index e38c574aacf..9b4d39aae07 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/persistence/SerializingProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.persistence;
+package org.eclipse.rse.internal.persistence;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -32,6 +32,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.rse.core.SystemResourceManager;
+import org.eclipse.rse.persistence.IRSEPersistenceProvider;
 import org.eclipse.rse.persistence.dom.RSEDOM;
 
 
diff --git a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
index a276deea634..a3595d9233f 100644
--- a/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
+++ b/rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
@@ -166,13 +166,11 @@ public class RSEDOMImporter implements IRSEDOMImporter
 		IConnectorService service = null;
 		
 		// get attributes of the service
-		String name = connectorServiceNode.getName();
-		String type = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue();
-		String group = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_GROUP).getValue();
+//		String name = connectorServiceNode.getName();
+//		String type = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue();
+//		String group = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_GROUP).getValue();
 		boolean useSSL = getBooleanValue(connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_USE_SSL).getValue());
 		
-       
-				
 		// first restore subsystems (since right now we need subsystem to get at service
 		RSEDOMNode[] ssChildren = connectorServiceNode.getChildren(IRSEDOMConstants.TYPE_SUBSYSTEM);
 		for (int s = 0; s < ssChildren.length; s++)
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index d628a43411b..caed08588d1 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -989,11 +989,11 @@ Contributors:
  <extension
        point="org.eclipse.rse.ui.persistenceProviders">
     <persistenceProvider
-          class="org.eclipse.rse.persistence.SerializingProvider"
+          class="org.eclipse.rse.internal.persistence.SerializingProvider"
           id="org.eclipse.rse.persistence.SerializingProvider"
           name="Serializing Persistence Provider"/>
     <persistenceProvider
-          class="org.eclipse.rse.persistence.PropertyFileProvider"
+          class="org.eclipse.rse.internal.persistence.PropertyFileProvider"
           id="org.eclipse.rse.persistence.PropertyFileProvider"
           name="Property File Persistence Provider"/>
  </extension>