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/05 16:56:59 UTC
svn commit: r1600677 - in /sling/trunk/tooling/ide: eclipse-core/
eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/
eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ eclipse-ui/
eclipse-ui/src/org/apache/sling/ide/eclipse/ui/act...
Author: rombert
Date: Thu Jun 5 14:56:58 2014
New Revision: 1600677
URL: http://svn.apache.org/r1600677
Log:
SLING-3600 - Review strings for correctness and consistency
Bulk string changes.
Modified:
sling/trunk/tooling/ide/eclipse-core/plugin.xml
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java
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/actions/JcrNewNodeAction.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeDeleteAction.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeRenameAction.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/NewNodeDialog.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.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/internal/InstallEditorSection.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServersActionModeFiddlerActionDelegate.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/TolerantXMLTokenizer.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/propertyPages/SlingProjectPropertyPage.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewNodeWizard.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewNodeWizardPage.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java
Modified: sling/trunk/tooling/ide/eclipse-core/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/plugin.xml?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-core/plugin.xml Thu Jun 5 14:56:58 2014
@@ -76,8 +76,8 @@
<extension point="org.eclipse.wst.server.core.runtimeTypes">
<runtimeType
id="org.apache.sling.ide.launchpadRuntimeType"
- name="Sling Launchpad (runtime name)"
- description="Sling Launchpad (runtime description)"
+ name="Sling Runtime"
+ description="A Sling-compatible runtime which contains the Felix Web Console and a JCR WebDAV remoting entry point."
vendor="Sling"
version="1.0"
class="org.apache.sling.ide.eclipse.core.internal.SlingLaunchpadRuntime">
@@ -90,8 +90,8 @@
<extension point="org.eclipse.wst.server.core.serverTypes">
<serverType
id="org.apache.sling.ide.launchpadServer"
- name="External Sling Launchpad (server name)"
- description="External Sling Launchpad (server description)"
+ name="Sling Server (external)"
+ description="A Sling server whose lifecycle is controlled independently from Eclipse."
supportsRemoteHosts="true"
runtime="true"
startTimeout="30000"
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java Thu Jun 5 14:56:58 2014
@@ -118,7 +118,7 @@ public class SlingLaunchpadBehaviour ext
setServerState(IServer.STATE_STARTED);
} else {
setServerState(IServer.STATE_STOPPED);
- String message = "Unable to connect to Sling Lanchpad. Please make sure a Launchpad instance is running ";
+ String message = "Unable to connect to the Server. Please make sure a server instance is running ";
if (result != null) {
message += " (" + result.toString() + ")";
}
@@ -277,7 +277,7 @@ public class SlingLaunchpadBehaviour ext
monitor.worked(1);
if (supportBundleVersion == null) {
throw new CoreException(new Status(Status.ERROR, Activator.PLUGIN_ID,
- "The support bundle was not found, please install it via the server properties page"));
+ "The support bundle was not found, please install it via the server properties page."));
}
IJavaProject javaProject = ProjectHelper.asJavaProject(project);
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadLaunchConfigurationDelegate.java Thu Jun 5 14:56:58 2014
@@ -34,8 +34,8 @@ public class SlingLaunchpadLaunchConfigu
IServer server = ServerUtil.getServer(configuration);
if (server == null) {
- throw new CoreException(new Status(IStatus.ERROR, "org.apache.sling.slingclipse", 0, "No server found",
- null));
+ throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "No server found for configuration "
+ + configuration));
}
SlingLaunchpadBehaviour launchpad = (SlingLaunchpadBehaviour) server.loadAdapter(SlingLaunchpadBehaviour.class,
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java Thu Jun 5 14:56:58 2014
@@ -78,7 +78,7 @@ public class ArchetypeParametersWizardPa
super("archetypeParametersPage");
this.parent = parent;
setTitle("Configure Archetype Properties");
- setDescription("This step configured the archetype properties");
+ setDescription("This step configures the archetype properties");
setImageDescriptor(parent.getLogo());
}
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ChooseArchetypeWizardPage.java Thu Jun 5 14:56:58 2014
@@ -208,7 +208,7 @@ public class ChooseArchetypeWizardPage e
@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException,
InterruptedException {
- monitor.beginTask("discovering archetypes...", 5);
+ monitor.beginTask("Discovering archetypes...", 5);
ArchetypeManager manager = MavenPluginActivator.getDefault().getArchetypeManager();
monitor.worked(1);
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=1600677&r1=1600676&r2=1600677&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 Thu Jun 5 14:56:58 2014
@@ -38,7 +38,6 @@ public class NewSlingBundleWizard extend
EmbeddedArtifactLocator artifactsLocator = Activator.getDefault().getArtifactsLocator();
- // TODO - should we remove the special slingclipse-embedded artifact and simply install our version?
EmbeddedArchetypeInstaller archetypeInstaller = new EmbeddedArchetypeInstaller(
"org.apache.sling", "sling-bundle-archetype", "slingclipse-embedded");
try {
Modified: sling/trunk/tooling/ide/eclipse-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/plugin.xml?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/plugin.xml Thu Jun 5 14:56:58 2014
@@ -390,21 +390,23 @@
class="org.apache.sling.ide.eclipse.ui.actions.JcrNewNodeAction"
icon="icons/obj16/sling_misc.gif"
id="org.apache.sling.ide.eclipse.ui.nav.NewJcrNodeAction"
- label="&New JCR Node"
+ label="&New Node..."
menubarPath="jcr">
</action>
<action
class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
icon="icons/obj16/sling_misc.gif"
id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
- label="&Rename JCR Node"
+ definitionId="org.eclipse.ui.edit.rename"
+ label="&Rename..."
menubarPath="jcr">
</action>
<action
class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
icon="icons/obj16/sling_misc.gif"
id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
- label="&Delete JCR Node"
+ definitionId="org.eclipse.ui.edit.delete"
+ label="&Delete..."
menubarPath="jcr">
</action>
<visibility>
@@ -449,21 +451,23 @@
class="org.apache.sling.ide.eclipse.ui.actions.JcrNewNodeAction"
icon="icons/obj16/sling_misc.gif"
id="org.apache.sling.ide.eclipse.ui.nav.NewNonJcrNodeAction"
- label="New JCR Node"
+ label="Node..."
menubarPath="common.new.menu/jcr">
</action>
<action
class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
icon="icons/obj16/sling_misc.gif"
id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
- label="&Rename JCR Node"
+ label="&Rename..."
+ definitionId="org.eclipse.ui.edit.rename"
toolbarPath="common.new.menu/jcr">
</action>
<action
class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
icon="icons/obj16/sling_misc.gif"
id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
- label="&Delete JCR Node"
+ label="&Delete..."
+ definitionId="org.eclipse.ui.edit.delete"
toolbarPath="common.new.menu/jcr">
</action>
<action
@@ -471,7 +475,7 @@
icon="icons/obj16/sling_misc.gif"
id="org.apache.sling.ide.eclipse.ui.actionsOpenHtmlInBrowserAction"
label="&Open .html (on server) in browser"
- menubarPath="common.open.menu/jcr">
+ toolbarPath="common.open.menu/jcr">
</action>
<visibility>
<objectState
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNewNodeAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNewNodeAction.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNewNodeAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNewNodeAction.java Thu Jun 5 14:56:58 2014
@@ -49,7 +49,8 @@ public class JcrNewNodeAction implements
IStructuredSelection ss = (IStructuredSelection)selection;
JcrNode node = (JcrNode) ss.getFirstElement();
if (!node.canCreateChild()) {
- MessageDialog.openInformation(shell, "Cannot create node", "Node not in filter.xml");
+ MessageDialog.openInformation(shell, "Cannot create node",
+ "Node is not covered by the workspace filter as defined in filter.xml");
return;
}
Repository repository = ServerUtil.getDefaultRepository(node.getProject());
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeDeleteAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeDeleteAction.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeDeleteAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeDeleteAction.java Thu Jun 5 14:56:58 2014
@@ -17,10 +17,7 @@
package org.apache.sling.ide.eclipse.ui.actions;
import org.apache.sling.ide.eclipse.ui.nav.model.JcrNode;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -52,7 +49,7 @@ public class JcrNodeDeleteAction impleme
if (this.node==null) {
return;
}
- if (!MessageDialog.openConfirm(shell, "Delete JCR node", "Do you really want to delete '"+node.getLabel()+"'?")) {
+ if (!MessageDialog.openConfirm(shell, "Delete Node", "Do you really want to delete '" + node.getLabel() + "'?")) {
return;
}
node.delete();
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeRenameAction.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeRenameAction.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeRenameAction.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/JcrNodeRenameAction.java Thu Jun 5 14:56:58 2014
@@ -51,8 +51,8 @@ public class JcrNodeRenameAction impleme
if (this.node==null) {
return;
}
- InputDialog id = new InputDialog(shell, "Change JCR node name",
- "Enter new name for JCR node '"+node.getDescription()+"':", node.getLabel(), new IInputValidator() {
+ InputDialog id = new InputDialog(shell, "Change Node Name", "Enter new name for node '" + node.getDescription()
+ + "':", node.getLabel(), new IInputValidator() {
@Override
public String isValid(String newText) {
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/NewNodeDialog.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/NewNodeDialog.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/NewNodeDialog.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/actions/NewNodeDialog.java Thu Jun 5 14:56:58 2014
@@ -41,7 +41,7 @@ public class NewNodeDialog extends Input
public NewNodeDialog(Shell parentShell, JcrNode node,
NodeTypeRegistry ntManager) throws RepositoryException {
- super(parentShell, "Enter JCR node name",
+ super(parentShell, "Enter Node Name",
"Enter name for new node under:\n path: "+node.getJcrPath(), "", null);
this.parentNodeType = node.getPrimaryType();
this.ntManager = ntManager;
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java Thu Jun 5 14:56:58 2014
@@ -64,7 +64,7 @@ public class ConnectionEditorSection ext
Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED
| ExpandableComposite.TITLE_BAR | Section.DESCRIPTION | ExpandableComposite.FOCUS_TITLE);
section.setText("Connection");
- section.setDescription("Specify how to connect to the launchpad instace");
+ section.setDescription("Connection details for this server");
section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL));
// ports
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=1600677&r1=1600676&r2=1600677&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 Thu Jun 5 14:56:58 2014
@@ -76,7 +76,7 @@ public class ImportWizardPage extends Wi
public ImportWizardPage(String pageName, IStructuredSelection selection) {
super(pageName);
setTitle(pageName); // NON-NLS-1
- setDescription("Import content from a Sling Repository into the workspace"); // NON-NLS-1
+ setDescription("Import content from a Repository into the workspace"); // NON-NLS-1
Object selectedResource = selection.getFirstElement();
if (selectedResource instanceof IProject) {
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java Thu Jun 5 14:56:58 2014
@@ -88,7 +88,7 @@ public class InstallEditorSection extend
Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED
| ExpandableComposite.TITLE_BAR | Section.DESCRIPTION | ExpandableComposite.FOCUS_TITLE);
section.setText("Install");
- section.setDescription("Specify how to install artifacts to the launchpad instance");
+ section.setDescription("Specify how to install bundles on the server");
section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL));
// ports
@@ -109,7 +109,7 @@ public class InstallEditorSection extend
GridData data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
bundleLocalInstallButton.setLayoutData(data);
- quickLocalInstallButton = toolkit.createButton(composite, "Install bundles directly from local directory",
+ quickLocalInstallButton = toolkit.createButton(composite, "Install bundles directly from the filesystem",
SWT.RADIO);
data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
quickLocalInstallButton.setLayoutData(data);
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServersActionModeFiddlerActionDelegate.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServersActionModeFiddlerActionDelegate.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServersActionModeFiddlerActionDelegate.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ServersActionModeFiddlerActionDelegate.java Thu Jun 5 14:56:58 2014
@@ -16,7 +16,6 @@
*/
package org.apache.sling.ide.eclipse.ui.internal;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/TolerantXMLTokenizer.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/TolerantXMLTokenizer.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/TolerantXMLTokenizer.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/TolerantXMLTokenizer.java Thu Jun 5 14:56:58 2014
@@ -27,10 +27,10 @@ import de.pdark.decentxml.XMLTokenizer;
/**
* In parts inspired by/copied from de.pdark.decentxml.XMLTokenizer.
* <p>
- * Note: this variant of the XMLTokenizer became necessary since
- * XMLTokenizer incorrectly complains when encountering a '>' inside
- * an xml attribute value. The '>' is valid though.
- * TODO: file a bug with decentXml and remove this class as soon as fixed
+ * Note: this variant of the XMLTokenizer became necessary since XMLTokenizer incorrectly complains when encountering a
+ * '>' inside an xml attribute value. The '>' is valid though.
+ *
+ * @see <a href="https://code.google.com/p/decentxml/issues/detail?id=5">decentxml bug report</a>
*/
final class TolerantXMLTokenizer extends XMLTokenizer {
private final IFile file;
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/propertyPages/SlingProjectPropertyPage.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/propertyPages/SlingProjectPropertyPage.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/propertyPages/SlingProjectPropertyPage.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/propertyPages/SlingProjectPropertyPage.java Thu Jun 5 14:56:58 2014
@@ -68,7 +68,7 @@ public class SlingProjectPropertyPage ex
c.setLayout(new GridLayout(3, false));
- new Label(c, SWT.NONE).setText("Folder to sync");
+ new Label(c, SWT.NONE).setText("Content sync root directory");
folderText = new Text(c, SWT.BORDER);
folderText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
folderText.setText(ProjectUtil.getSyncDirectoryValue(getProject()));
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewNodeWizard.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewNodeWizard.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewNodeWizard.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewNodeWizard.java Thu Jun 5 14:56:58 2014
@@ -122,22 +122,6 @@ public class NewNodeWizard extends Wizar
}
/**
- * We will initialize file contents with a sample text.
- */
-
- private InputStream openContentStream() {
- String contents =
- "This is the initial file contents for *.mpe file that should be word-sorted in the Preview page of the multi-page editor";
- return new ByteArrayInputStream(contents.getBytes());
- }
-
- private void throwCoreException(String message) throws CoreException {
- IStatus status =
- new Status(IStatus.ERROR, "org.apache.sling.ide.eclipse-ui", IStatus.OK, message, null);
- throw new CoreException(status);
- }
-
- /**
* We will accept the selection in the workbench to see if
* we can initialize from it.
* @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewNodeWizardPage.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewNodeWizardPage.java?rev=1600677&r1=1600676&r2=1600677&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewNodeWizardPage.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/NewNodeWizardPage.java Thu Jun 5 14:56:58 2014
@@ -34,8 +34,8 @@ public class NewNodeWizardPage extends W
*/
public NewNodeWizardPage(ISelection selection) {
super("wizardPage");
- setTitle("Add a new JCR node");
- setDescription("Create a new JCR node under the current selection");
+ setTitle("Add a new Node");
+ setDescription("Create a new node under the current selection");
this.selection = selection;
}
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=1600677&r1=1600676&r2=1600677&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 Thu Jun 5 14:56:58 2014
@@ -78,7 +78,7 @@ public class SetupServerWizardPage exten
public SetupServerWizardPage(AbstractNewSlingApplicationWizard parent) {
super("chooseArchetypePage");
- setTitle("Select or Setup Launchpad Server");
+ setTitle("Select or Create Server");
setDescription("This step defines which server to use with the new project.");
setImageDescriptor(parent.getLogo());
}