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:27 UTC
svn commit: r1600477 - in /sling/trunk/tooling/ide: eclipse-m2e-ui/META-INF/
eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/
eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ eclipse-ui/
eclipse-ui/src/org/apache/sling/ide/ec...
Author: rombert
Date: Wed Jun 4 19:42:26 2014
New Revision: 1600477
URL: http://svn.apache.org/r1600477
Log:
SLING-3031 - [Tooling] add whitelabel support for slingclipse
Enrich and consistently use the WhitelabelSupport class throughout the
UI classes.
Removed:
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/SharedImages.java
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/sling-logo.png
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/m2e/internal/sling.gif
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/NewSlingBundleWizard.java
sling/trunk/tooling/ide/eclipse-ui/plugin.xml
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/WhitelabelSupport.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/editors/WebBrowser.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/editors/WebBrowserEditorInput.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportWizard.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/AbstractNewSlingApplicationWizard.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertProjectsWizard.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToBundleAction.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewSlingContentProjectWizard.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF Wed Jun 4 19:42:26 2014
@@ -25,6 +25,7 @@ Import-Package: org.apache.commons.httpc
org.apache.maven.plugin,
org.apache.sling.ide.artifacts,
org.apache.sling.ide.eclipse.core,
+ org.apache.sling.ide.eclipse.ui,
org.apache.sling.ide.eclipse.ui.wizards,
org.apache.sling.ide.osgi,
org.apache.sling.ide.transport,
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/NewSlingBundleWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/NewSlingBundleWizard.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/NewSlingBundleWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/NewSlingBundleWizard.java Wed Jun 4 19:42:26 2014
@@ -23,13 +23,14 @@ import org.apache.sling.ide.artifacts.Em
import org.apache.sling.ide.artifacts.EmbeddedArtifactLocator;
import org.apache.sling.ide.eclipse.m2e.EmbeddedArchetypeInstaller;
import org.apache.sling.ide.eclipse.m2e.internal.Activator;
+import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
import org.eclipse.core.runtime.CoreException;
public class NewSlingBundleWizard extends AbstractNewMavenBasedSlingApplicationWizard {
@Override
public String doGetWindowTitle() {
- return "New Sling Bundle Project";
+ return "New " + WhitelabelSupport.getProductName() + " Bundle Project";
}
@Override
Modified: sling/trunk/tooling/ide/eclipse-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/plugin.xml?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/plugin.xml Wed Jun 4 19:42:26 2014
@@ -209,7 +209,7 @@
icon="icons/obj16/sling_misc.gif"
id="org.apache.sling.ide.eclipse-ui.navigatorJcrContent"
labelProvider="org.apache.sling.ide.eclipse.ui.nav.JcrContentLabelProvider"
- name="Sling (JCR) Content"
+ name="Repository Content"
priority="highest">
<triggerPoints>
<or>
@@ -346,7 +346,9 @@
</extension>
<extension
point="org.eclipse.ui.console.consoleFactories">
+ <!-- TODO - whitelabel -->
<consoleFactory
+ icon="icons/obj16/sling_misc.gif"
class="org.apache.sling.ide.eclipse.ui.internal.console.SlingConsoleFactory"
label="Sling Console">
</consoleFactory>
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/WhitelabelSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/WhitelabelSupport.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/WhitelabelSupport.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/WhitelabelSupport.java Wed Jun 4 19:42:26 2014
@@ -21,7 +21,50 @@ import org.eclipse.jface.resource.ImageD
public class WhitelabelSupport {
- // allow customization of the JCR NODE ICON
- public static ImageDescriptor JCR_NODE_ICON = SharedImages.NT_UNSTRUCTURED_ICON;
+ private static volatile ImageDescriptor PROJECT_WIZARD_BANNER = SharedImages.SLING_LOG;
+ private static volatile ImageDescriptor JCR_NODE_ICON = SharedImages.NT_UNSTRUCTURED_ICON;
+ private static volatile ImageDescriptor WIZARD_BANNER = SharedImages.SLING_LOG;
+ private static volatile ImageDescriptor PRODUCT_ICON = SharedImages.SLING_ICON;
+ private static volatile String PRODUCT_NAME = "Sling";
+
+ public static ImageDescriptor getJcrNodeIcon() {
+ return JCR_NODE_ICON;
+ }
+
+ public static void setJcrNodeIcon(ImageDescriptor jcrNodeIcon) {
+ JCR_NODE_ICON = jcrNodeIcon;
+ }
+
+ public static String getProductName() {
+ return PRODUCT_NAME;
+ }
+
+ public static void setProductName(String productName) {
+ PRODUCT_NAME = productName;
+ }
+
+ public static ImageDescriptor getWizardBanner() {
+ return WIZARD_BANNER;
+ }
+
+ public static void setWizardBanner(ImageDescriptor wizardBanner) {
+ WIZARD_BANNER = wizardBanner;
+ }
+
+ public static ImageDescriptor getProjectWizardBanner() {
+ return PROJECT_WIZARD_BANNER;
+ }
+
+ public static void setProjectWizardBanner(ImageDescriptor projectWizardBanner) {
+ PROJECT_WIZARD_BANNER = projectWizardBanner;
+ }
+
+ public static ImageDescriptor getProductIcon() {
+ return PRODUCT_ICON;
+ }
+
+ public static void setProductIcon(ImageDescriptor productIcon) {
+ PRODUCT_ICON = productIcon;
+ }
}
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/editors/WebBrowser.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/editors/WebBrowser.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/editors/WebBrowser.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/editors/WebBrowser.java Wed Jun 4 19:42:26 2014
@@ -16,7 +16,7 @@
*/
package org.apache.sling.ide.eclipse.ui.editors;
-import org.apache.sling.ide.eclipse.ui.internal.SharedImages;
+import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
@@ -56,7 +56,7 @@ public class WebBrowser extends EditorPa
}
setInput(input);
setSite(site);
- setTitleImage(SharedImages.SLING_ICON.createImage());
+ setTitleImage(WhitelabelSupport.getProductIcon().createImage());
}
@Override
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/editors/WebBrowserEditorInput.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/editors/WebBrowserEditorInput.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/editors/WebBrowserEditorInput.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/editors/WebBrowserEditorInput.java Wed Jun 4 19:42:26 2014
@@ -16,7 +16,7 @@
*/
package org.apache.sling.ide.eclipse.ui.editors;
-import org.apache.sling.ide.eclipse.ui.internal.SharedImages;
+import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
@@ -50,7 +50,7 @@ public class WebBrowserEditorInput imple
@Override
public ImageDescriptor getImageDescriptor() {
- return SharedImages.SLING_ICON;
+ return WhitelabelSupport.getProductIcon();
}
@Override
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportWizard.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ExportWizard.java Wed Jun 4 19:42:26 2014
@@ -20,6 +20,7 @@ import java.lang.reflect.InvocationTarge
import org.apache.sling.ide.eclipse.core.ServerUtil;
import org.apache.sling.ide.eclipse.core.internal.ResourceChangeCommandFactory;
+import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
import org.apache.sling.ide.transport.Command;
import org.apache.sling.ide.transport.Repository;
import org.apache.sling.ide.transport.Result;
@@ -41,7 +42,7 @@ public class ExportWizard extends Wizard
public void init(IWorkbench workbench, IResource syncStartPoint) {
setWindowTitle("Repositoy Export"); // NON-NLS-1
setNeedsProgressMonitor(true);
- setDefaultPageImageDescriptor(SharedImages.SLING_LOG);
+ setDefaultPageImageDescriptor(WhitelabelSupport.getWizardBanner());
this.syncStartPoint = syncStartPoint;
this.exportPage = new ExportWizardPage(syncStartPoint);
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizardPage.java Wed Jun 4 19:42:26 2014
@@ -246,7 +246,7 @@ public class ImportWizardPage extends Wi
}
if (!ProjectHelper.isContentProject(container.getProject())) {
- return "Project " + container.getProject().getName() + " is not a a Sling content project";
+ return "Project " + container.getProject().getName() + " is not a content project";
}
if ( ! ProjectUtil.isInsideContentSyncRoot(container) ) {
@@ -296,7 +296,7 @@ public class ImportWizardPage extends Wi
}
if (this.repositoryCombo == null || this.repositoryCombo.getServer() == null) {
- setErrorMessage("Please select a Sling launchpad instance");
+ setErrorMessage("Please select a server instance");
return false;
}
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java Wed Jun 4 19:42:26 2014
@@ -445,7 +445,7 @@ public class JcrNode implements IAdaptab
}
if (typeUnstructured) {
- return WhitelabelSupport.JCR_NODE_ICON.createImage();
+ return WhitelabelSupport.getJcrNodeIcon().createImage();
} else if (plainFolder || typeFolder) {
return workbenchLabelProvider.getImage(ProjectUtil.getSyncDirectory(getProject()));
} else if (typeFile && resource!=null) {
@@ -456,14 +456,14 @@ public class JcrNode implements IAdaptab
}
}
if (isVaultFile) {
- return WhitelabelSupport.JCR_NODE_ICON.createImage();
+ return WhitelabelSupport.getJcrNodeIcon().createImage();
}
return workbenchLabelProvider.getImage(resource);
} else {
if (resource!=null && !isVaultFile) {
return workbenchLabelProvider.getImage(resource);
}
- return WhitelabelSupport.JCR_NODE_ICON.createImage();
+ return WhitelabelSupport.getJcrNodeIcon().createImage();
}
}
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/AbstractNewSlingApplicationWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/AbstractNewSlingApplicationWizard.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/AbstractNewSlingApplicationWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/AbstractNewSlingApplicationWizard.java Wed Jun 4 19:42:26 2014
@@ -23,8 +23,8 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.sling.ide.eclipse.core.ConfigurationHelper;
+import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
import org.apache.sling.ide.eclipse.ui.internal.Activator;
-import org.apache.sling.ide.eclipse.ui.internal.SharedImages;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -232,7 +232,7 @@ public abstract class AbstractNewSlingAp
}
public ImageDescriptor getLogo() {
- return SharedImages.SLING_LOG;
+ return WhitelabelSupport.getProjectWizardBanner();
}
public abstract String doGetWindowTitle();
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertProjectsWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertProjectsWizard.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertProjectsWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertProjectsWizard.java Wed Jun 4 19:42:26 2014
@@ -18,8 +18,8 @@ package org.apache.sling.ide.eclipse.ui.
import java.util.List;
+import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
import org.apache.sling.ide.eclipse.ui.internal.Activator;
-import org.apache.sling.ide.eclipse.ui.internal.SharedImages;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.wizard.Wizard;
@@ -32,7 +32,7 @@ public class ConvertProjectsWizard exten
private String description;
public ConvertProjectsWizard(List<IProject> projects, List<IProject> initialSelection, String title, String description) {
- setDefaultPageImageDescriptor(SharedImages.SLING_LOG);
+ setDefaultPageImageDescriptor(WhitelabelSupport.getWizardBanner());
setWindowTitle(title);
setDialogSettings(Activator.getDefault().getDialogSettings());
setNeedsProgressMonitor(true);
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToBundleAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToBundleAction.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToBundleAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToBundleAction.java Wed Jun 4 19:42:26 2014
@@ -90,7 +90,7 @@ public class ConvertToBundleAction imple
}
ConvertProjectsWizard wizard = new ConvertProjectsWizard(applicableProjects, initialSelection,
- "Convert to Sling Bundle Project(s)", "Select project(s) to convert to Sling Bundle project(s)");
+ "Convert to Bundle Project(s)", "Select project(s) to convert to Bundle project(s)");
final Display display = getDisplay();
final WizardDialog dialog = new WizardDialog(display.getActiveShell(), wizard);
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java Wed Jun 4 19:42:26 2014
@@ -63,7 +63,7 @@ public class ConvertToContentPackageActi
String jcrRootLocation = ProjectHelper.getInferredContentProjectContentRoot(project)
.getProjectRelativePath().append("jcr_root").toPortableString();
- final InputDialog id = new InputDialog(getDisplay().getActiveShell(), "Convert to Sling Content-Package Project",
+ final InputDialog id = new InputDialog(getDisplay().getActiveShell(), "Convert to Content Project",
"Confirm content sync root location of " + project.getName() + ":", jcrRootLocation,
new IInputValidator() {
@Override
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ImportWizard.java Wed Jun 4 19:42:26 2014
@@ -18,10 +18,10 @@ package org.apache.sling.ide.eclipse.ui.
import java.lang.reflect.InvocationTargetException;
+import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
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;
@@ -112,7 +112,7 @@ public class ImportWizard extends Wizard
setWindowTitle("Repositoy Import"); // NON-NLS-1
setNeedsProgressMonitor(true);
mainPage = new ImportWizardPage("Import from Repository", selection); // NON-NLS-1
- setDefaultPageImageDescriptor(SharedImages.SLING_LOG);
+ setDefaultPageImageDescriptor(WhitelabelSupport.getWizardBanner());
}
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewSlingContentProjectWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewSlingContentProjectWizard.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewSlingContentProjectWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewSlingContentProjectWizard.java Wed Jun 4 19:42:26 2014
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.sling.ide.eclipse.core.ConfigurationHelper;
-import org.apache.sling.ide.eclipse.ui.internal.SharedImages;
+import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -38,8 +38,8 @@ public class NewSlingContentProjectWizar
public void addPages() {
page = new WizardNewProjectCreationPage("New Project");
- page.setImageDescriptor(SharedImages.SLING_LOG);
- page.setDescription("Please select the coordinates for the new Sling content project");
+ page.setImageDescriptor(WhitelabelSupport.getProjectWizardBanner());
+ page.setDescription("Please select the coordinates for the new content project");
addPage(page);
addPage(getSetupServerWizardPage());
}
@@ -109,7 +109,7 @@ public class NewSlingContentProjectWizar
@Override
public String doGetWindowTitle() {
- return "New Sling Content Project";
+ return "New Content Project";
}
private static interface Operation {
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java?rev=1600477&r1=1600476&r2=1600477&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java Wed Jun 4 19:42:26 2014
@@ -79,7 +79,7 @@ public class SetupServerWizardPage exten
public SetupServerWizardPage(AbstractNewSlingApplicationWizard parent) {
super("chooseArchetypePage");
setTitle("Select or Setup Launchpad Server");
- setDescription("This step defines which server to use with the new Sling application.");
+ setDescription("This step defines which server to use with the new project.");
setImageDescriptor(parent.getLogo());
}