You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2014/06/04 21:42:05 UTC
svn commit: r1600476 - in /sling/trunk/tooling/ide/eclipse-ui: ./
src/org/apache/sling/ide/eclipse/ui/internal/
src/org/apache/sling/ide/eclipse/ui/wizards/
Author: rombert
Date: Wed Jun 4 19:42:04 2014
New Revision: 1600476
URL: http://svn.apache.org/r1600476
Log:
SLING-3031 - [Tooling] add whitelabel support for slingclipse
Allow reuse of the ImportWizard
- use more meaningful ids for the import wizard and its category
- move the ImportWizard to an exported package
Added:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java (contents, props changed)
- copied, changed from r1600475, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
Removed:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/plugin.xml
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java
Modified: sling/trunk/tooling/ide/eclipse-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/plugin.xml?rev=1600476&r1=1600475&r2=1600476&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/plugin.xml Wed Jun 4 19:42:04 2014
@@ -125,17 +125,17 @@
<extension
point="org.eclipse.ui.importWizards">
<category
- id="org.apache.sling.ide.eclipse.ui.internal.sampleCategory"
+ id="org.apache.sling.ide.eclipse.ui.wizards.import"
name="Sling">
</category>
<wizard
- category="org.apache.sling.ide.eclipse.ui.internal.sampleCategory"
- class="org.apache.sling.ide.eclipse.ui.internal.ImportWizard"
+ category="org.apache.sling.ide.eclipse.ui.wizards.import"
+ class="org.apache.sling.ide.eclipse.ui.wizards.ImportWizard"
icon="icons/obj16/sling_misc.gif"
- id="org.apache.sling.ide.eclipse.ui.internal.ImportWizard"
- name="Import from Sling Repository">
+ id="org.apache.sling.ide.eclipse.ui.wizards.importWizard"
+ name="Import from Repository">
<description>
- Import a file from the local file system into the workspace.
+ Import content from a remote Repository into the local Workspace.
</description>
</wizard>
</extension>
@@ -144,13 +144,13 @@
point="org.eclipse.ui.commands">
<command
id="org.apache.sling.ide.commands.importContent"
- name="Import Content from a Sling Repository"
+ name="Import Content from a Repository"
categoryId="org.eclipse.ui.category.window"
defaultHandler="org.apache.sling.ide.eclipse.ui.internal.ImportContentAction">
</command>
<command
id="org.apache.sling.ide.commands.exportContent"
- name="Export content to a Sling Repository"
+ name="Export content to a Repository"
categoryId="org.eclipse.ui.category.window"
defaultHandler="org.apache.sling.ide.eclipse.ui.internal.ExportContentAction">
</command>
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java?rev=1600476&r1=1600475&r2=1600476&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportContentAction.java Wed Jun 4 19:42:04 2014
@@ -19,6 +19,7 @@ package org.apache.sling.ide.eclipse.ui.
import java.util.Iterator;
import org.apache.sling.ide.eclipse.core.internal.ProjectHelper;
+import org.apache.sling.ide.eclipse.ui.wizards.ImportWizard;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
Copied: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java (from r1600475, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java)
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java?p2=sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java&p1=sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java&r1=1600475&r2=1600476&rev=1600476&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java Wed Jun 4 19:42:04 2014
@@ -14,10 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.ui.internal;
+package org.apache.sling.ide.eclipse.ui.wizards;
import java.lang.reflect.InvocationTargetException;
+import org.apache.sling.ide.eclipse.ui.internal.Activator;
+import org.apache.sling.ide.eclipse.ui.internal.ImportRepositoryContentAction;
+import org.apache.sling.ide.eclipse.ui.internal.ImportWizardPage;
+import org.apache.sling.ide.eclipse.ui.internal.SharedImages;
import org.apache.sling.ide.serialization.SerializationException;
import org.apache.sling.ide.serialization.SerializationManager;
import org.eclipse.core.resources.IProject;
Propchange: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL