ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r700581 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse: CHANGES.txt plugin.xml src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java src/java/org/apache/ivyde/eclipse/ui/console/IvyConsolePageParticipant.java
Date Tue, 30 Sep 2008 21:18:51 GMT
Author: hibou
Date: Tue Sep 30 14:18:51 2008
New Revision: 700581

URL: http://svn.apache.org/viewvc?rev=700581&view=rev
Log:
IVYDE-123: add a close button to the Ivy Console (inspired from the CVS console code)

Added:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsolePageParticipant.java
  (with props)
Modified:
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt?rev=700581&r1=700580&r2=700581&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/CHANGES.txt Tue Sep 30 14:18:51 2008
@@ -15,6 +15,7 @@
 - IMPROVE: Make the classpath entries order configuration UI more intuitive (IVYDE-104)
 - IMPROVE: Retrieve after resolve feature does not clean target directory first (IVYDE-105)
 
+- FIX: Can't close ivy console in eclipse (IVYDE-123)
 - FIX: IvyDE does not do property value expansion (IVYDE-90)
 - FIX: Resolve in workspace does not pick up all projects in workspace (IVYDE-118) (thanks
to Matt Goldspink)
 - FIX: Ivy editor: code completion missing for matcher attribute of conflicts manager (IVYDE-99)

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml?rev=700581&r1=700580&r2=700581&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml (original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/plugin.xml Tue Sep 30 14:18:51 2008
@@ -26,6 +26,17 @@
 	     icon="icons/logo16x16.gif">
 	  </consoleFactory>
 	</extension>
+ <extension
+       point="org.eclipse.ui.console.consolePageParticipants">
+    <consolePageParticipant
+          class="org.apache.ivyde.eclipse.ui.console.IvyConsolePageParticipant"
+          id="org.apache.ivyde.eclipse.ivyConsolePageParticipant">
+       <enablement>
+          <instanceof
+                value="org.apache.ivyde.eclipse.ui.console.IvyConsole">
+          </instanceof></enablement>
+    </consolePageParticipant>
+ </extension>
 
    <extension
          point="org.eclipse.jdt.ui.classpathContainerPage">

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java?rev=700581&r1=700580&r2=700581&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsole.java
Tue Sep 30 14:18:51 2008
@@ -35,7 +35,7 @@
 import org.eclipse.ui.console.MessageConsoleStream;
 
 /**
- * This class is used to deal with ivy output, and is largely insprired of CVSOutputConsole
for its
+ * This class is used to deal with ivy output, and is largely inspired of CVSOutputConsole
for its
  * implementation
  */
 public class IvyConsole extends MessageConsole implements MessageLogger {
@@ -187,7 +187,7 @@
         RGB rgb = PreferenceConverter.getColor(IvyPlugin.getDefault().getPreferenceStore(),
             preference);
         if (rgb == PreferenceConverter.COLOR_DEFAULT_DEFAULT) {
-            //CheckStyle:MagicNumber| OFF
+            // CheckStyle:MagicNumber| OFF
             if (PREF_CONSOLE_DEBUG_COLOR.equals(preference)) {
                 rgb = new RGB(180, 180, 255);
             } else if (PREF_CONSOLE_VERBOSE_COLOR.equals(preference)) {
@@ -197,7 +197,7 @@
             } else if (PREF_CONSOLE_ERROR_COLOR.equals(preference)) {
                 rgb = new RGB(255, 0, 0);
             }
-            //CheckStyle:MagicNumber| ON
+            // CheckStyle:MagicNumber| ON
         }
         return new Color(display, rgb);
     }

Added: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsolePageParticipant.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsolePageParticipant.java?rev=700581&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsolePageParticipant.java
(added)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsolePageParticipant.java
Tue Sep 30 14:18:51 2008
@@ -0,0 +1,51 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.apache.ivyde.eclipse.ui.console;
+
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsoleConstants;
+import org.eclipse.ui.console.IConsolePageParticipant;
+import org.eclipse.ui.console.actions.CloseConsoleAction;
+import org.eclipse.ui.part.IPageBookViewPage;
+
+public class IvyConsolePageParticipant implements IConsolePageParticipant {
+
+    private CloseConsoleAction closeAction;
+
+    public void init(IPageBookViewPage page, IConsole console) {
+        closeAction = new CloseConsoleAction(console);
+        IToolBarManager manager = page.getSite().getActionBars().getToolBarManager();
+        manager.appendToGroup(IConsoleConstants.LAUNCH_GROUP, closeAction);
+    }
+
+    public void dispose() {
+        closeAction = null;
+    }
+
+    public Object getAdapter(Class adapter) {
+        return null;
+    }
+
+    public void activated() {
+    }
+
+    public void deactivated() {
+    }
+
+}

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsolePageParticipant.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsolePageParticipant.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/console/IvyConsolePageParticipant.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message