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:40 UTC
svn commit: r1600478 - in /sling/trunk/tooling/ide/eclipse-ui: ./ META-INF/
src/org/apache/sling/ide/eclipse/ui/console/
src/org/apache/sling/ide/eclipse/ui/internal/console/
Author: rombert
Date: Wed Jun 4 19:42:39 2014
New Revision: 1600478
URL: http://svn.apache.org/r1600478
Log:
SLING-3031 - [Tooling] add whitelabel support for slingclipse
Whitelabel support for the SlingConsoleFactory.
Added:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/console/
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/console/SlingConsoleFactory.java (contents, props changed)
- copied, changed from r1600477, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleFactory.java
Removed:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleFactory.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-ui/plugin.xml
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleEventListener.java
Modified: sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF?rev=1600478&r1=1600477&r2=1600478&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF Wed Jun 4 19:42:39 2014
@@ -89,6 +89,7 @@ Require-Bundle: org.eclipse.wst.common.p
org.eclipse.swt
Service-Component: OSGI-INF/*.xml
Export-Package: org.apache.sling.ide.eclipse.ui,
+ org.apache.sling.ide.eclipse.ui.console,
org.apache.sling.ide.eclipse.ui.internal;x-friends:="org.apache.sling.ide.eclipse-test",
org.apache.sling.ide.eclipse.ui.propertyPages,
org.apache.sling.ide.eclipse.ui.views,
Modified: sling/trunk/tooling/ide/eclipse-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/plugin.xml?rev=1600478&r1=1600477&r2=1600478&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/plugin.xml Wed Jun 4 19:42:39 2014
@@ -346,10 +346,12 @@
</extension>
<extension
point="org.eclipse.ui.console.consoleFactories">
- <!-- TODO - whitelabel -->
+ <!-- while the id raises a validation warning, it does no harm and it allows the consoleFactory
+ to be included in the whitelabel support, so don't remove it -->
<consoleFactory
+ id="org.apache.sling.ide.eclipse.ui.console"
icon="icons/obj16/sling_misc.gif"
- class="org.apache.sling.ide.eclipse.ui.internal.console.SlingConsoleFactory"
+ class="org.apache.sling.ide.eclipse.ui.console.SlingConsoleFactory"
label="Sling Console">
</consoleFactory>
</extension>
Copied: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/console/SlingConsoleFactory.java (from r1600477, sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleFactory.java)
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/console/SlingConsoleFactory.java?p2=sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/console/SlingConsoleFactory.java&p1=sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleFactory.java&r1=1600477&r2=1600478&rev=1600478&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleFactory.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/console/SlingConsoleFactory.java Wed Jun 4 19:42:39 2014
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.ide.eclipse.ui.internal.console;
+package org.apache.sling.ide.eclipse.ui.console;
+import org.apache.sling.ide.eclipse.ui.WhitelabelSupport;
import org.eclipse.ui.console.ConsolePlugin;
import org.eclipse.ui.console.IConsole;
import org.eclipse.ui.console.IConsoleFactory;
@@ -24,8 +25,8 @@ import org.eclipse.ui.console.MessageCon
public class SlingConsoleFactory implements IConsoleFactory {
- public static final String CONSOLE_NAME = "Sling console";
-
+ public static final String CONSOLE_TYPE_SLING = "Sling";
+
private MessageConsole console;
@Override
@@ -41,7 +42,8 @@ public class SlingConsoleFactory impleme
private void initConsole(IConsoleManager consoleManager) {
if (console == null) {
- console = new MessageConsole(CONSOLE_NAME, null);
+ console = new MessageConsole(WhitelabelSupport.getProductName() + " Console", CONSOLE_TYPE_SLING,
+ WhitelabelSupport.getProductIcon(), true);
consoleManager.addConsoles(new IConsole[] { console });
}
}
Propchange: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/console/SlingConsoleFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/console/SlingConsoleFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleEventListener.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleEventListener.java?rev=1600478&r1=1600477&r2=1600478&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleEventListener.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/console/SlingConsoleEventListener.java Wed Jun 4 19:42:39 2014
@@ -26,6 +26,7 @@ import java.util.LinkedHashMap;
import java.util.Set;
import org.apache.commons.io.IOUtils;
+import org.apache.sling.ide.eclipse.ui.console.SlingConsoleFactory;
import org.apache.sling.ide.eclipse.ui.internal.Activator;
import org.apache.sling.ide.transport.CommandExecutionProperties;
import org.eclipse.ui.console.ConsolePlugin;
@@ -85,7 +86,7 @@ public class SlingConsoleEventListener i
public void consolesAdded(IConsole[] consoles) {
synchronized (sync) {
for (IConsole console : consoles) {
- if (console.getName().equals(SlingConsoleFactory.CONSOLE_NAME)) {
+ if (console.getType().equals(SlingConsoleFactory.CONSOLE_TYPE_SLING)) {
slingConsole = (MessageConsole) console;
synchronized (delayedEvents) {
for (Iterator<Event> it = delayedEvents.iterator(); it.hasNext();) {
@@ -111,7 +112,7 @@ public class SlingConsoleEventListener i
if (slingConsole == null) {
final IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
for (IConsole console : consoleManager.getConsoles()) {
- if (console.getName().equals(SlingConsoleFactory.CONSOLE_NAME)) {
+ if (console.getType().equals(SlingConsoleFactory.CONSOLE_TYPE_SLING)) {
slingConsole = (MessageConsole) console;
break;
}