db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bakk...@apache.org
Subject svn commit: r329187 [64/66] - in /db/derby/code/trunk: ./ frameworks/NetworkServer/ frameworks/NetworkServer/bin/ frameworks/embedded/bin/ java/build/ java/build/org/apache/derbyBuild/ java/build/org/apache/derbyBuild/eclipse/ java/build/org/apache/der...
Date Fri, 28 Oct 2005 12:52:21 GMT
Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/plugin.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/plugin.xml?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/plugin.xml (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/plugin.xml Fri Oct 28 04:51:50 2005
@@ -1,408 +1,408 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.apache.derby.ui"
-   name="Apache Derby Ui Plug-in for Eclipse"
-   version="1.1.0"
-   provider-name="The Apache Software Foundation"
-   class="org.apache.derby.ui.DerbyPlugin">
-
-   <runtime>
-      <library name="ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.apache.derby.core"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui.console"/>
-   </requires>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            adaptable="true"
-            objectClass="org.eclipse.jdt.core.IJavaProject"
-            id="org.apache.derby.ui.DerbyMenu">
-         <menu
-               label="Apache Derby"
-               path="additions"
-               id="org.apache.derby.ui.menu1">
-            <separator name="separator1"/>
-            <separator name="separator2"/>
-            <separator name="separator3"/>
-            <separator name="separator4"/>
-         </menu>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.jdt.core.IJavaProject"
-            id="org.apache.derby.ui.DerbyActions">
-         <visibility>
-            <not>
-               <objectState
-                     value="org.apache.derby.ui.derbyEngine"
-                     name="nature"/>
-            </not>
-         </visibility>
-         <action
-               enablesFor="1"
-               label="Add Apache Derby nature"
-               icon="icons/add.gif"
-               class="org.apache.derby.ui.popup.actions.AddDerbyNature"
-               menubarPath="org.apache.derby.ui.menu1/separator1"
-               id="org.apache.derby.ui.action1"/>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.jdt.core.IJavaProject"
-            id="org.apache.derby.ui.DerbyProjects">
-         <visibility>
-            <objectState
-                  value="org.apache.derby.ui.derbyEngine"
-                  name="nature"/>
-         </visibility>
-         <action
-               enablesFor="1"
-               label="Remove Apache Derby nature"
-               icon="icons/rem.gif"
-               class="org.apache.derby.ui.popup.actions.RemoveDerbyNature"
-               menubarPath="org.apache.derby.ui.menu1/separator1"
-               id="org.apache.derby.ui.action2"/>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.jdt.core.IJavaProject"
-            id="org.apache.derby.ui.StartStopActions">
-         <visibility>
-            <objectState
-                  value="org.apache.derby.ui.derbyEngine"
-                  name="nature"/>
-         </visibility>
-         <action
-               label="Stop Derby Network Server"
-               icon="icons/stop.gif"
-               class="org.apache.derby.ui.actions.StopAction"
-               menubarPath="org.apache.derby.ui.menu1/separator2"
-               enablesFor="1"
-               id="org.apache.derby.ui.StopAction">
-            <enablement>
-               <objectState
-                     value="org.apache.derby.ui.isrun"
-                     name="sessionProperty">
-               </objectState>
-            </enablement>
-         </action>
-         <action
-               label="Start Derby Network Server"
-               icon="icons/start.gif"
-               class="org.apache.derby.ui.actions.StartAction"
-               menubarPath="org.apache.derby.ui.menu1/separator2"
-               enablesFor="1"
-               id="org.apache.derby.ui.StartAction">
-            <enablement>
-               <not>
-                  <objectState
-                        value="org.apache.derby.ui.isrun"
-                        name="sessionProperty">
-                  </objectState>
-               </not>
-            </enablement>
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.jdt.core.IJavaProject"
-            id="org.apache.derby.ui.RunIJ">
-         <visibility>
-            <objectState
-                  value="org.apache.derby.ui.derbyEngine"
-                  name="nature"/>
-         </visibility>
-         <action
-               enablesFor="1"
-               label="ij (Interactive SQL)"
-               class="org.apache.derby.ui.actions.IJAction"
-               icon="icons/ij.gif"
-               menubarPath="org.apache.derby.ui.menu1/separator3"
-               id="org.apache.derby.ui.ijAction1"/>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.jdt.core.IJavaProject"
-            id="org.apache.derby.ui.SysInfo">
-         <visibility>
-            <objectState
-                  value="org.apache.derby.ui.derbyEngine"
-                  name="nature"/>
-         </visibility>
-         <action
-               enablesFor="1"
-               label="sysinfo (Derby System Information)"
-               icon="icons/sysinfo.gif"
-               class="org.apache.derby.ui.actions.SysInfoAction"
-               menubarPath="org.apache.derby.ui.menu1/separator4"
-               id="org.apache.derby.ui.sysInfo1"/>
-      </objectContribution>
-   </extension>
-   <extension
-         id="derbyEngine"
-         name="Apache Derby "
-         point="org.eclipse.core.resources.natures">
-      <requires-nature id="org.eclipse.jdt.core.javanature"/>
-      <runtime>
-         <run class="org.apache.derby.ui.nature.DerbyNature"/>
-      </runtime>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            adaptable="true"
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.sql"
-            id="org.apache.derby.ui.DerbyMenu">
-         <menu
-               label="Apache Derby"
-               id="org.apache.derby.ui.menu2">
-            <separator name="separator4"/>
-         </menu>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.sql"
-            id="org.apache.derby.ui.RunSQLScript">
-         <action
-               enablesFor="1"
-               label="Run SQL Script using &apos;ij&apos;"
-               class="org.apache.derby.ui.actions.IJAction"
-               icon="icons/ij.gif"
-               menubarPath="org.apache.derby.ui.menu2/separator4"
-               id="org.apache.derby.ui.SQLScript"/>
-      </objectContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            id="org.apache.derby.ui.DerbyMenu">
-         <menu
-               label="Apache Derby"
-               path="additions"
-               id="org.apache.derby.ui.menu2">
-            <separator name="separator1"/>
-            <separator name="separator2"/>
-            <separator name="separator3"/>
-            <separator name="separator4"/>
-         </menu>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            id="org.apache.derby.ui.DerbyActions">
-         <visibility>
-            <not>
-               <objectState
-                     value="org.apache.derby.ui.derbyEngine"
-                     name="nature"/>
-            </not>
-         </visibility>
-         <action
-               enablesFor="1"
-               label="Add Apache Derby nature"
-               icon="icons/add.gif"
-               class="org.apache.derby.ui.popup.actions.AddDerbyNature"
-               menubarPath="org.apache.derby.ui.menu2/separator1"
-               id="org.apache.derby.ui.action1"/>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            id="org.apache.derby.ui.DerbyProjects">
-         <visibility>
-            <objectState
-                  value="org.apache.derby.ui.derbyEngine"
-                  name="nature"/>
-         </visibility>
-         <action
-               enablesFor="1"
-               label="Remove Apache Derby nature"
-               icon="icons/rem.gif"
-               class="org.apache.derby.ui.popup.actions.RemoveDerbyNature"
-               menubarPath="org.apache.derby.ui.menu2/separator1"
-               id="org.apache.derby.ui.action2"/>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            id="org.apache.derby.ui.StartStopActions">
-         <visibility>
-            <objectState
-                  value="org.apache.derby.ui.derbyEngine"
-                  name="nature"/>
-         </visibility>
-         <action
-               enablesFor="1"
-               label="Stop Derby Network Server"
-               icon="icons/stop.gif"
-               class="org.apache.derby.ui.actions.StopAction"
-               menubarPath="org.apache.derby.ui.menu2/separator2"
-               id="org.apache.derby.ui.StopAction">
-            <enablement>
-               <objectState
-                     value="org.apache.derby.ui.isrun"
-                     name="sessionProperty"/>
-            </enablement>
-         </action>
-         <action
-               enablesFor="1"
-               label="Start Derby Network Server"
-               icon="icons/start.gif"
-               class="org.apache.derby.ui.actions.StartAction"
-               menubarPath="org.apache.derby.ui.menu2/separator2"
-               id="org.apache.derby.ui.StartAction">
-            <enablement>
-               <not>
-                  <objectState
-                        value="org.apache.derby.ui.isrun"
-                        name="sessionProperty"/>
-               </not>
-            </enablement>
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            id="org.apache.derby.ui.RunIJ">
-         <visibility>
-            <objectState
-                  value="org.apache.derby.ui.derbyEngine"
-                  name="nature"/>
-         </visibility>
-         <action
-               enablesFor="1"
-               label="ij (Interactive SQL)"
-               icon="icons/ij.gif"
-               class="org.apache.derby.ui.actions.IJAction"
-               menubarPath="org.apache.derby.ui.menu2/separator3"
-               id="org.apache.derby.ui.ijAction2"/>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            id="org.apache.derby.ui.Sysinfo">
-         <visibility>
-            <objectState
-                  value="org.apache.derby.ui.derbyEngine"
-                  name="nature"/>
-         </visibility>
-         <action
-               label="sysinfo (Derby System Information)"
-               icon="icons/sysinfo.gif"
-               class="org.apache.derby.ui.actions.SysInfoAction"
-               menubarPath="org.apache.derby.ui.menu2/separator4"
-               id="org.apache.derby.ui.sysInfo2"/>
-      </objectContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.propertyPages">
-      <page
-            adaptable="true"
-            objectClass="org.eclipse.core.resources.IProject"
-            class="org.apache.derby.ui.properties.DerbyPropertiesPage"
-            name="Apache Derby"
-            id="org.apache.derby.ui.properties.DerbyServerProperty">
-         <filter
-               value="org.apache.derby.ui.derbyEngine"
-               name="nature"/>
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.ui.decorators">
-      <decorator
-            lightweight="true"
-            adaptable="true"
-            label="Derby Network Server Runnning"
-            class="org.apache.derby.ui.decorate.DerbyIsRunningDecorator"
-            state="true"
-            location="TOP_LEFT"
-            id="org.apache.derby.ui.DerbyIsRunningDecorator">
-         <description/>
-         <enablement>
-            <or>
-               <and>
-                  <objectClass name="org.eclipse.jdt.core.IJavaProject"/>
-                  <objectState
-                        value="org.apache.derby.ui.derbyEngine"
-                        name="nature"/>
-               </and>
-               <and>
-                  <objectClass name="org.eclipse.core.resources.IProject"/>
-                  <objectState
-                        value="org.apache.derby.ui.derbyEngine"
-                        name="nature"/>
-               </and>
-            </or>
-         </enablement>
-      </decorator>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            delegate="org.apache.derby.ui.launch.StartDerbyServerLaunchConfigurationDelegate"
-            public="false"
-            name="Start Apache Derby Network Server"
-            id="org.apache.derby.ui.startDerbyServerLaunchConfigurationType"
-            modes="run, debug"/>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            icon="icons/start.gif"
-            configTypeID="org.apache.derby.ui.startDerbyServerLaunchConfigurationType"
-            id="org.apache.derby.ui.startDerbyServerLaunchConfigurationTypeImage"/>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            delegate="org.apache.derby.ui.launch.StopDerbyServerLaunchConfigurationDelegate"
-            public="false"
-            name="Stop Apache Derby Network Server"
-            id="org.apache.derby.ui.stopDerbyServerLaunchConfigurationType"
-            modes="run, debug"/>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            icon="icons/stop.gif"
-            configTypeID="org.apache.derby.ui.stopDerbyServerLaunchConfigurationType"
-            id="org.apache.derby.ui.stopDerbyServerLaunchConfigurationTypeImage"/>
-   </extension>
-      <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            delegate="org.apache.derby.ui.launch.IJDerbyLaunchConfigurationDelegate"
-            public="false"
-            name="IJ"
-            id="org.apache.derby.ui.ijDerbyLaunchConfigurationType"
-            modes="run, debug"/>         
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            icon="icons/ij.gif"
-            configTypeID="org.apache.derby.ui.ijDerbyLaunchConfigurationType"
-            id="org.apache.derby.ui.ijDerbyLaunchConfigurationTypeImage"/>
-   </extension>
-      <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            delegate="org.apache.derby.ui.launch.SysInfoDerbyLaunchConfigurationDelegate"
-            public="false"
-            name="SysInfo"
-            id="org.apache.derby.ui.sysinfoDerbyLaunchConfigurationType"
-            modes="run, debug"/>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            icon="icons/sysinfo.gif"
-            configTypeID="org.apache.derby.ui.sysinfoDerbyLaunchConfigurationType"
-            id="org.apache.derby.ui.sysinfoDerbyLaunchConfigurationTypeImage"/>
-   </extension>
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin
+   id="org.apache.derby.ui"
+   name="Apache Derby Ui Plug-in for Eclipse"
+   version="1.1.0"
+   provider-name="The Apache Software Foundation"
+   class="org.apache.derby.ui.DerbyPlugin">
+
+   <runtime>
+      <library name="ui.jar">
+         <export name="*"/>
+      </library>
+   </runtime>
+
+   <requires>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.apache.derby.core"/>
+      <import plugin="org.eclipse.jdt.launching"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.jdt.core"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.ui.console"/>
+   </requires>
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            adaptable="true"
+            objectClass="org.eclipse.jdt.core.IJavaProject"
+            id="org.apache.derby.ui.DerbyMenu">
+         <menu
+               label="Apache Derby"
+               path="additions"
+               id="org.apache.derby.ui.menu1">
+            <separator name="separator1"/>
+            <separator name="separator2"/>
+            <separator name="separator3"/>
+            <separator name="separator4"/>
+         </menu>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.jdt.core.IJavaProject"
+            id="org.apache.derby.ui.DerbyActions">
+         <visibility>
+            <not>
+               <objectState
+                     value="org.apache.derby.ui.derbyEngine"
+                     name="nature"/>
+            </not>
+         </visibility>
+         <action
+               enablesFor="1"
+               label="Add Apache Derby nature"
+               icon="icons/add.gif"
+               class="org.apache.derby.ui.popup.actions.AddDerbyNature"
+               menubarPath="org.apache.derby.ui.menu1/separator1"
+               id="org.apache.derby.ui.action1"/>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.jdt.core.IJavaProject"
+            id="org.apache.derby.ui.DerbyProjects">
+         <visibility>
+            <objectState
+                  value="org.apache.derby.ui.derbyEngine"
+                  name="nature"/>
+         </visibility>
+         <action
+               enablesFor="1"
+               label="Remove Apache Derby nature"
+               icon="icons/rem.gif"
+               class="org.apache.derby.ui.popup.actions.RemoveDerbyNature"
+               menubarPath="org.apache.derby.ui.menu1/separator1"
+               id="org.apache.derby.ui.action2"/>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.jdt.core.IJavaProject"
+            id="org.apache.derby.ui.StartStopActions">
+         <visibility>
+            <objectState
+                  value="org.apache.derby.ui.derbyEngine"
+                  name="nature"/>
+         </visibility>
+         <action
+               label="Stop Derby Network Server"
+               icon="icons/stop.gif"
+               class="org.apache.derby.ui.actions.StopAction"
+               menubarPath="org.apache.derby.ui.menu1/separator2"
+               enablesFor="1"
+               id="org.apache.derby.ui.StopAction">
+            <enablement>
+               <objectState
+                     value="org.apache.derby.ui.isrun"
+                     name="sessionProperty">
+               </objectState>
+            </enablement>
+         </action>
+         <action
+               label="Start Derby Network Server"
+               icon="icons/start.gif"
+               class="org.apache.derby.ui.actions.StartAction"
+               menubarPath="org.apache.derby.ui.menu1/separator2"
+               enablesFor="1"
+               id="org.apache.derby.ui.StartAction">
+            <enablement>
+               <not>
+                  <objectState
+                        value="org.apache.derby.ui.isrun"
+                        name="sessionProperty">
+                  </objectState>
+               </not>
+            </enablement>
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.jdt.core.IJavaProject"
+            id="org.apache.derby.ui.RunIJ">
+         <visibility>
+            <objectState
+                  value="org.apache.derby.ui.derbyEngine"
+                  name="nature"/>
+         </visibility>
+         <action
+               enablesFor="1"
+               label="ij (Interactive SQL)"
+               class="org.apache.derby.ui.actions.IJAction"
+               icon="icons/ij.gif"
+               menubarPath="org.apache.derby.ui.menu1/separator3"
+               id="org.apache.derby.ui.ijAction1"/>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.jdt.core.IJavaProject"
+            id="org.apache.derby.ui.SysInfo">
+         <visibility>
+            <objectState
+                  value="org.apache.derby.ui.derbyEngine"
+                  name="nature"/>
+         </visibility>
+         <action
+               enablesFor="1"
+               label="sysinfo (Derby System Information)"
+               icon="icons/sysinfo.gif"
+               class="org.apache.derby.ui.actions.SysInfoAction"
+               menubarPath="org.apache.derby.ui.menu1/separator4"
+               id="org.apache.derby.ui.sysInfo1"/>
+      </objectContribution>
+   </extension>
+   <extension
+         id="derbyEngine"
+         name="Apache Derby "
+         point="org.eclipse.core.resources.natures">
+      <requires-nature id="org.eclipse.jdt.core.javanature"/>
+      <runtime>
+         <run class="org.apache.derby.ui.nature.DerbyNature"/>
+      </runtime>
+   </extension>
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            adaptable="true"
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.sql"
+            id="org.apache.derby.ui.DerbyMenu">
+         <menu
+               label="Apache Derby"
+               id="org.apache.derby.ui.menu2">
+            <separator name="separator4"/>
+         </menu>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.sql"
+            id="org.apache.derby.ui.RunSQLScript">
+         <action
+               enablesFor="1"
+               label="Run SQL Script using &apos;ij&apos;"
+               class="org.apache.derby.ui.actions.IJAction"
+               icon="icons/ij.gif"
+               menubarPath="org.apache.derby.ui.menu2/separator4"
+               id="org.apache.derby.ui.SQLScript"/>
+      </objectContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.popupMenus">
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            id="org.apache.derby.ui.DerbyMenu">
+         <menu
+               label="Apache Derby"
+               path="additions"
+               id="org.apache.derby.ui.menu2">
+            <separator name="separator1"/>
+            <separator name="separator2"/>
+            <separator name="separator3"/>
+            <separator name="separator4"/>
+         </menu>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            id="org.apache.derby.ui.DerbyActions">
+         <visibility>
+            <not>
+               <objectState
+                     value="org.apache.derby.ui.derbyEngine"
+                     name="nature"/>
+            </not>
+         </visibility>
+         <action
+               enablesFor="1"
+               label="Add Apache Derby nature"
+               icon="icons/add.gif"
+               class="org.apache.derby.ui.popup.actions.AddDerbyNature"
+               menubarPath="org.apache.derby.ui.menu2/separator1"
+               id="org.apache.derby.ui.action1"/>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            id="org.apache.derby.ui.DerbyProjects">
+         <visibility>
+            <objectState
+                  value="org.apache.derby.ui.derbyEngine"
+                  name="nature"/>
+         </visibility>
+         <action
+               enablesFor="1"
+               label="Remove Apache Derby nature"
+               icon="icons/rem.gif"
+               class="org.apache.derby.ui.popup.actions.RemoveDerbyNature"
+               menubarPath="org.apache.derby.ui.menu2/separator1"
+               id="org.apache.derby.ui.action2"/>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            id="org.apache.derby.ui.StartStopActions">
+         <visibility>
+            <objectState
+                  value="org.apache.derby.ui.derbyEngine"
+                  name="nature"/>
+         </visibility>
+         <action
+               enablesFor="1"
+               label="Stop Derby Network Server"
+               icon="icons/stop.gif"
+               class="org.apache.derby.ui.actions.StopAction"
+               menubarPath="org.apache.derby.ui.menu2/separator2"
+               id="org.apache.derby.ui.StopAction">
+            <enablement>
+               <objectState
+                     value="org.apache.derby.ui.isrun"
+                     name="sessionProperty"/>
+            </enablement>
+         </action>
+         <action
+               enablesFor="1"
+               label="Start Derby Network Server"
+               icon="icons/start.gif"
+               class="org.apache.derby.ui.actions.StartAction"
+               menubarPath="org.apache.derby.ui.menu2/separator2"
+               id="org.apache.derby.ui.StartAction">
+            <enablement>
+               <not>
+                  <objectState
+                        value="org.apache.derby.ui.isrun"
+                        name="sessionProperty"/>
+               </not>
+            </enablement>
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            id="org.apache.derby.ui.RunIJ">
+         <visibility>
+            <objectState
+                  value="org.apache.derby.ui.derbyEngine"
+                  name="nature"/>
+         </visibility>
+         <action
+               enablesFor="1"
+               label="ij (Interactive SQL)"
+               icon="icons/ij.gif"
+               class="org.apache.derby.ui.actions.IJAction"
+               menubarPath="org.apache.derby.ui.menu2/separator3"
+               id="org.apache.derby.ui.ijAction2"/>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IProject"
+            id="org.apache.derby.ui.Sysinfo">
+         <visibility>
+            <objectState
+                  value="org.apache.derby.ui.derbyEngine"
+                  name="nature"/>
+         </visibility>
+         <action
+               label="sysinfo (Derby System Information)"
+               icon="icons/sysinfo.gif"
+               class="org.apache.derby.ui.actions.SysInfoAction"
+               menubarPath="org.apache.derby.ui.menu2/separator4"
+               id="org.apache.derby.ui.sysInfo2"/>
+      </objectContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            adaptable="true"
+            objectClass="org.eclipse.core.resources.IProject"
+            class="org.apache.derby.ui.properties.DerbyPropertiesPage"
+            name="Apache Derby"
+            id="org.apache.derby.ui.properties.DerbyServerProperty">
+         <filter
+               value="org.apache.derby.ui.derbyEngine"
+               name="nature"/>
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.ui.decorators">
+      <decorator
+            lightweight="true"
+            adaptable="true"
+            label="Derby Network Server Runnning"
+            class="org.apache.derby.ui.decorate.DerbyIsRunningDecorator"
+            state="true"
+            location="TOP_LEFT"
+            id="org.apache.derby.ui.DerbyIsRunningDecorator">
+         <description/>
+         <enablement>
+            <or>
+               <and>
+                  <objectClass name="org.eclipse.jdt.core.IJavaProject"/>
+                  <objectState
+                        value="org.apache.derby.ui.derbyEngine"
+                        name="nature"/>
+               </and>
+               <and>
+                  <objectClass name="org.eclipse.core.resources.IProject"/>
+                  <objectState
+                        value="org.apache.derby.ui.derbyEngine"
+                        name="nature"/>
+               </and>
+            </or>
+         </enablement>
+      </decorator>
+   </extension>
+   <extension
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="org.apache.derby.ui.launch.StartDerbyServerLaunchConfigurationDelegate"
+            public="false"
+            name="Start Apache Derby Network Server"
+            id="org.apache.derby.ui.startDerbyServerLaunchConfigurationType"
+            modes="run, debug"/>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            icon="icons/start.gif"
+            configTypeID="org.apache.derby.ui.startDerbyServerLaunchConfigurationType"
+            id="org.apache.derby.ui.startDerbyServerLaunchConfigurationTypeImage"/>
+   </extension>
+   <extension
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="org.apache.derby.ui.launch.StopDerbyServerLaunchConfigurationDelegate"
+            public="false"
+            name="Stop Apache Derby Network Server"
+            id="org.apache.derby.ui.stopDerbyServerLaunchConfigurationType"
+            modes="run, debug"/>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            icon="icons/stop.gif"
+            configTypeID="org.apache.derby.ui.stopDerbyServerLaunchConfigurationType"
+            id="org.apache.derby.ui.stopDerbyServerLaunchConfigurationTypeImage"/>
+   </extension>
+      <extension
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="org.apache.derby.ui.launch.IJDerbyLaunchConfigurationDelegate"
+            public="false"
+            name="IJ"
+            id="org.apache.derby.ui.ijDerbyLaunchConfigurationType"
+            modes="run, debug"/>         
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            icon="icons/ij.gif"
+            configTypeID="org.apache.derby.ui.ijDerbyLaunchConfigurationType"
+            id="org.apache.derby.ui.ijDerbyLaunchConfigurationTypeImage"/>
+   </extension>
+      <extension
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="org.apache.derby.ui.launch.SysInfoDerbyLaunchConfigurationDelegate"
+            public="false"
+            name="SysInfo"
+            id="org.apache.derby.ui.sysinfoDerbyLaunchConfigurationType"
+            modes="run, debug"/>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            icon="icons/sysinfo.gif"
+            configTypeID="org.apache.derby.ui.sysinfoDerbyLaunchConfigurationType"
+            id="org.apache.derby.ui.sysinfoDerbyLaunchConfigurationTypeImage"/>
+   </extension>
+</plugin>

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/DerbyPlugin.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/DerbyPlugin.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/DerbyPlugin.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/DerbyPlugin.java Fri Oct 28 04:51:50 2005
@@ -1,64 +1,64 @@
-/*
-
-	Derby - Class org.apache.derby.ui.DerbyPlugin
-	
-	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed 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.derby.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DerbyPlugin extends AbstractUIPlugin {
-	//Only a single instance for the Eclipse platform.
-	private static DerbyPlugin plugin;
-	
-
-	/**
-	 * The constructor.
-	 */
-	public DerbyPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static DerbyPlugin getDefault() {
-		return plugin;
-	}
-
-
-}
+/*
+
+	Derby - Class org.apache.derby.ui.DerbyPlugin
+	
+	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+	
+	Licensed 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.derby.ui;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class DerbyPlugin extends AbstractUIPlugin {
+	//Only a single instance for the Eclipse platform.
+	private static DerbyPlugin plugin;
+	
+
+	/**
+	 * The constructor.
+	 */
+	public DerbyPlugin() {
+		super();
+		plugin = this;
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static DerbyPlugin getDefault() {
+		return plugin;
+	}
+
+
+}

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/DerbyPlugin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/actions/IJAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/actions/StartAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/actions/StopAction.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/actions/StopAction.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/actions/StopAction.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/actions/StopAction.java Fri Oct 28 04:51:50 2005
@@ -1,76 +1,76 @@
-/*
-
-	Derby - Class org.apache.derby.ui.actions.StopAction
-	
-	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed 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.derby.ui.actions;
-
-import org.apache.derby.ui.common.CommonNames;
-import org.apache.derby.ui.common.Messages;
-import org.apache.derby.ui.util.DerbyServerUtils;
-import org.apache.derby.ui.util.SelectionUtil;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-
-public class StopAction implements IObjectActionDelegate {
-
-	private IJavaProject currentJavaProject;
-	private IProject currentProject;
-	private Thread server=null;
-	public StopAction() {
-		super();
-	}
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	public void run(IAction action) {
-		try {
-			if(currentJavaProject!=null){
-				currentProject=currentJavaProject.getProject();
-				
-			}
-			DerbyServerUtils.getDefault().stopDerbyServer(currentProject);
-			
-		
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-			Shell shell = new Shell();
-			MessageDialog.openInformation(
-				shell,
-				CommonNames.PLUGIN_NAME,
-				Messages.D_NS_STOP_ERROR+
-				SelectionUtil.getStatusMessages(e));
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		currentJavaProject = SelectionUtil.findSelectedJavaProject(selection);
-		if(currentJavaProject==null){
-			currentProject=org.apache.derby.ui.util.SelectionUtil.findSelectedProject(selection);
-		}
-	}
-}
+/*
+
+	Derby - Class org.apache.derby.ui.actions.StopAction
+	
+	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+	
+	Licensed 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.derby.ui.actions;
+
+import org.apache.derby.ui.common.CommonNames;
+import org.apache.derby.ui.common.Messages;
+import org.apache.derby.ui.util.DerbyServerUtils;
+import org.apache.derby.ui.util.SelectionUtil;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+
+public class StopAction implements IObjectActionDelegate {
+
+	private IJavaProject currentJavaProject;
+	private IProject currentProject;
+	private Thread server=null;
+	public StopAction() {
+		super();
+	}
+
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+	}
+
+	public void run(IAction action) {
+		try {
+			if(currentJavaProject!=null){
+				currentProject=currentJavaProject.getProject();
+				
+			}
+			DerbyServerUtils.getDefault().stopDerbyServer(currentProject);
+			
+		
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			Shell shell = new Shell();
+			MessageDialog.openInformation(
+				shell,
+				CommonNames.PLUGIN_NAME,
+				Messages.D_NS_STOP_ERROR+
+				SelectionUtil.getStatusMessages(e));
+		}
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+		currentJavaProject = SelectionUtil.findSelectedJavaProject(selection);
+		if(currentJavaProject==null){
+			currentProject=org.apache.derby.ui.util.SelectionUtil.findSelectedProject(selection);
+		}
+	}
+}

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/actions/StopAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/actions/SysInfoAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/common/CommonNames.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/common/CommonNames.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/common/CommonNames.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/common/CommonNames.java Fri Oct 28 04:51:50 2005
@@ -1,59 +1,59 @@
-/*
-
-	Derby - Class org.apache.derby.ui.common.CommonNames
-	
-	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed 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.derby.ui.common;
-
-
-public class CommonNames {
-	//Network Server related
-	public static String DERBY_SERVER_CLASS="org.apache.derby.drda.NetworkServerControl";
-	public static String DERBY_SERVER="Derby Network Server";
-	public static String START_DERBY_SERVER="start";
-	public static String SHUTDOWN_DERBY_SERVER="shutdown";
-	
-	//Tools related
-	public static String SYSINFO_CLASS="org.apache.derby.tools.sysinfo";
-	public static String SYSINFO="SYSINFO";
-	public static String IJ_CLASS="org.apache.derby.tools.ij";
-	public static String IJ="IJ";
-	public static String SQL_SCRIPT="SQL Script";
-	
-	//actual information
-	public static String CORE_PATH="org.apache.derby.core";
-	public static String UI_PATH="org.apache.derby.ui";
-	public static String PLUGIN_NAME="Apache Derby Ui Plug-in";
-	
-	//The next to be used with UI_PATH for adding nature. isrunning and decorator
-	public static String DERBY_NATURE=UI_PATH+"."+"derbyEngine";
-	public static String ISRUNNING="isrun";
-	public static String RUNDECORATOR=UI_PATH+"."+"DerbyIsRunningDecorator";
-	
-	//Launch Config Types
-	public static String START_SERVER_LAUNCH_CONFIG_TYPE=UI_PATH+".startDerbyServerLaunchConfigurationType";
-	public static String STOP_SERVER_LAUNCH_CONFIG_TYPE=UI_PATH+".stopDerbyServerLaunchConfigurationType";
-	public static String IJ_LAUNCH_CONFIG_TYPE=UI_PATH+".ijDerbyLaunchConfigurationType";
-	public static String SYSINFO_LAUNCH_CONFIG_TYPE=UI_PATH+".sysinfoDerbyLaunchConfigurationType";
-	
-	//JVM Poperties
-	public static String D_IJ_PROTOCOL=" -Dij.protocol=";
-	public static String DERBY_PROTOCOL="jdbc:derby:";
-	public static String D_SYSTEM_HOME=" -Dderby.system.home=";
-	
-}
+/*
+
+	Derby - Class org.apache.derby.ui.common.CommonNames
+	
+	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+	
+	Licensed 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.derby.ui.common;
+
+
+public class CommonNames {
+	//Network Server related
+	public static String DERBY_SERVER_CLASS="org.apache.derby.drda.NetworkServerControl";
+	public static String DERBY_SERVER="Derby Network Server";
+	public static String START_DERBY_SERVER="start";
+	public static String SHUTDOWN_DERBY_SERVER="shutdown";
+	
+	//Tools related
+	public static String SYSINFO_CLASS="org.apache.derby.tools.sysinfo";
+	public static String SYSINFO="SYSINFO";
+	public static String IJ_CLASS="org.apache.derby.tools.ij";
+	public static String IJ="IJ";
+	public static String SQL_SCRIPT="SQL Script";
+	
+	//actual information
+	public static String CORE_PATH="org.apache.derby.core";
+	public static String UI_PATH="org.apache.derby.ui";
+	public static String PLUGIN_NAME="Apache Derby Ui Plug-in";
+	
+	//The next to be used with UI_PATH for adding nature. isrunning and decorator
+	public static String DERBY_NATURE=UI_PATH+"."+"derbyEngine";
+	public static String ISRUNNING="isrun";
+	public static String RUNDECORATOR=UI_PATH+"."+"DerbyIsRunningDecorator";
+	
+	//Launch Config Types
+	public static String START_SERVER_LAUNCH_CONFIG_TYPE=UI_PATH+".startDerbyServerLaunchConfigurationType";
+	public static String STOP_SERVER_LAUNCH_CONFIG_TYPE=UI_PATH+".stopDerbyServerLaunchConfigurationType";
+	public static String IJ_LAUNCH_CONFIG_TYPE=UI_PATH+".ijDerbyLaunchConfigurationType";
+	public static String SYSINFO_LAUNCH_CONFIG_TYPE=UI_PATH+".sysinfoDerbyLaunchConfigurationType";
+	
+	//JVM Poperties
+	public static String D_IJ_PROTOCOL=" -Dij.protocol=";
+	public static String DERBY_PROTOCOL="jdbc:derby:";
+	public static String D_SYSTEM_HOME=" -Dderby.system.home=";
+	
+}

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/common/CommonNames.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/common/Messages.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/common/Messages.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/common/Messages.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/common/Messages.java Fri Oct 28 04:51:50 2005
@@ -1,47 +1,47 @@
-/*
-
-	Derby - Class org.apache.derby.ui.common.Messages
-	
-	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed 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.derby.ui.common;
-
-public class Messages {
-	public static String D_NS_ATTEMPT_STARTED="Attempting to start the Apache Derby Network Server on port ";
-	public static String D_NS_ATTEMPT_STOPPED="Attempting to stop the Apache Derby Network Server on port ";
-	
-	//public static String D_NS_STARTED="Apache Derby Network Server started.";
-	//public static String D_NS_STOPPED="Apache Derby Network Server stopped.";
-
-	public static String D_NS_START_ERROR="Error starting Derby Network Server:\n";
-	public static String D_NS_STOP_ERROR="Error stopping Derby Network Server:\n";
-	
-	public static String ADDING_NATURE="Adding Apache Derby Nature...";
-	public static String DERBY_NATURE_ADDED="Finished adding Apache Derby Nature to the selected project";
-	public static String ERROR_ADDING_NATURE="Error adding Derby jars to the project";
-	
-	public static String REMOVING_NATURE="Removing Apache Derby Nature...";
-	public static String DERBY_NATURE_REMOVED="Finished removing Apache Derby Nature from the selected project";
-	public static String ERROR_REMOVING_NATURE="Error removing Derby jars from the project";
-	
-	public static String NO_DERBY_NATURE="The selected project does not have an Apache Derby nature.";
-	public static String ADD_N_TRY="Please add the Derby nature and try again.";
-	
-	public static String NO_ACTION="Unable to execute the action";
-	public static String SERVER_RUNNING="The Network Server is already running.\nStop the server prior to changing the settings.";
-}
+/*
+
+	Derby - Class org.apache.derby.ui.common.Messages
+	
+	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+	
+	Licensed 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.derby.ui.common;
+
+public class Messages {
+	public static String D_NS_ATTEMPT_STARTED="Attempting to start the Apache Derby Network Server on port ";
+	public static String D_NS_ATTEMPT_STOPPED="Attempting to stop the Apache Derby Network Server on port ";
+	
+	//public static String D_NS_STARTED="Apache Derby Network Server started.";
+	//public static String D_NS_STOPPED="Apache Derby Network Server stopped.";
+
+	public static String D_NS_START_ERROR="Error starting Derby Network Server:\n";
+	public static String D_NS_STOP_ERROR="Error stopping Derby Network Server:\n";
+	
+	public static String ADDING_NATURE="Adding Apache Derby Nature...";
+	public static String DERBY_NATURE_ADDED="Finished adding Apache Derby Nature to the selected project";
+	public static String ERROR_ADDING_NATURE="Error adding Derby jars to the project";
+	
+	public static String REMOVING_NATURE="Removing Apache Derby Nature...";
+	public static String DERBY_NATURE_REMOVED="Finished removing Apache Derby Nature from the selected project";
+	public static String ERROR_REMOVING_NATURE="Error removing Derby jars from the project";
+	
+	public static String NO_DERBY_NATURE="The selected project does not have an Apache Derby nature.";
+	public static String ADD_N_TRY="Please add the Derby nature and try again.";
+	
+	public static String NO_ACTION="Unable to execute the action";
+	public static String SERVER_RUNNING="The Network Server is already running.\nStop the server prior to changing the settings.";
+}

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/common/Messages.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/decorate/DerbyIsRunningDecorator.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/decorate/DerbyIsRunningDecorator.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/decorate/DerbyIsRunningDecorator.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/decorate/DerbyIsRunningDecorator.java Fri Oct 28 04:51:50 2005
@@ -1,84 +1,84 @@
-/*
-
-	Derby - Class org.apache.derby.ui.decorator.DerbyIsRunningDecorator
-	
-	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed 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.derby.ui.decorate;
-
-import org.apache.derby.ui.DerbyPlugin;
-import org.apache.derby.ui.common.CommonNames;
-import org.apache.derby.ui.util.DerbyServerUtils;
-import org.apache.derby.ui.util.Logger;
-import org.apache.derby.ui.util.SelectionUtil;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IDecoratorManager;
-
-
-
-public class DerbyIsRunningDecorator     extends LabelProvider
-implements ILightweightLabelDecorator {
-
-
-	private static final ImageDescriptor derbyRunningImageDesc = ImageDescriptor.
-	createFromURL(Platform.getBundle(CommonNames.UI_PATH).getEntry("/icons/"+CommonNames.ISRUNNING+".gif"));
-	
-    public void decorate(Object element, IDecoration decoration) {
-    	IProject proj=null;
-    	if(element instanceof IJavaProject){
-    		proj = ((IJavaProject)element).getProject();
-    	}else{
-    		proj=(IProject)element;
-    	}
-    	try {
-			if (DerbyServerUtils.getDefault().getRunning(proj)) {
-				decoration.addOverlay(derbyRunningImageDesc);
-			}
-    	}
-    	catch (CoreException ce) {
-    		Logger.log(SelectionUtil.getStatusMessages(ce),IStatus.ERROR);
-    	}
-    }
-
-
-    	private void startUpdateDecor(IProject proj) {
-    	final LabelProviderChangedEvent evnt = new LabelProviderChangedEvent(this, proj); 
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				fireLabelProviderChanged(evnt);
-			}
-		});
-    }
-
-    	public static void performUpdateDecor(IProject proj) {
-    		IDecoratorManager dm = DerbyPlugin.getDefault().getWorkbench().getDecoratorManager();
-    		DerbyIsRunningDecorator decorator = (DerbyIsRunningDecorator)dm.getBaseLabelProvider(CommonNames.RUNDECORATOR);
-    		decorator.startUpdateDecor(proj);
-        }
-        	
-}
+/*
+
+	Derby - Class org.apache.derby.ui.decorator.DerbyIsRunningDecorator
+	
+	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+	
+	Licensed 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.derby.ui.decorate;
+
+import org.apache.derby.ui.DerbyPlugin;
+import org.apache.derby.ui.common.CommonNames;
+import org.apache.derby.ui.util.DerbyServerUtils;
+import org.apache.derby.ui.util.Logger;
+import org.apache.derby.ui.util.SelectionUtil;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.jface.viewers.ILightweightLabelDecorator;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.LabelProviderChangedEvent;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IDecoratorManager;
+
+
+
+public class DerbyIsRunningDecorator     extends LabelProvider
+implements ILightweightLabelDecorator {
+
+
+	private static final ImageDescriptor derbyRunningImageDesc = ImageDescriptor.
+	createFromURL(Platform.getBundle(CommonNames.UI_PATH).getEntry("/icons/"+CommonNames.ISRUNNING+".gif"));
+	
+    public void decorate(Object element, IDecoration decoration) {
+    	IProject proj=null;
+    	if(element instanceof IJavaProject){
+    		proj = ((IJavaProject)element).getProject();
+    	}else{
+    		proj=(IProject)element;
+    	}
+    	try {
+			if (DerbyServerUtils.getDefault().getRunning(proj)) {
+				decoration.addOverlay(derbyRunningImageDesc);
+			}
+    	}
+    	catch (CoreException ce) {
+    		Logger.log(SelectionUtil.getStatusMessages(ce),IStatus.ERROR);
+    	}
+    }
+
+
+    	private void startUpdateDecor(IProject proj) {
+    	final LabelProviderChangedEvent evnt = new LabelProviderChangedEvent(this, proj); 
+		Display.getDefault().asyncExec(new Runnable() {
+			public void run() {
+				fireLabelProviderChanged(evnt);
+			}
+		});
+    }
+
+    	public static void performUpdateDecor(IProject proj) {
+    		IDecoratorManager dm = DerbyPlugin.getDefault().getWorkbench().getDecoratorManager();
+    		DerbyIsRunningDecorator decorator = (DerbyIsRunningDecorator)dm.getBaseLabelProvider(CommonNames.RUNDECORATOR);
+    		decorator.startUpdateDecor(proj);
+        }
+        	
+}

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/decorate/DerbyIsRunningDecorator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java Fri Oct 28 04:51:50 2005
@@ -1,29 +1,29 @@
-/*
-
-	Derby - Class org.apache.derby.ui.launch.IJDerbyLaunchConfigurationDelegate
-	
-	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed 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.derby.ui.launch;
-
-import org.eclipse.jdt.launching.JavaLaunchDelegate;
-
-
-public class IJDerbyLaunchConfigurationDelegate extends
-		JavaLaunchDelegate {
-
-}
+/*
+
+	Derby - Class org.apache.derby.ui.launch.IJDerbyLaunchConfigurationDelegate
+	
+	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+	
+	Licensed 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.derby.ui.launch;
+
+import org.eclipse.jdt.launching.JavaLaunchDelegate;
+
+
+public class IJDerbyLaunchConfigurationDelegate extends
+		JavaLaunchDelegate {
+
+}

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java Fri Oct 28 04:51:50 2005
@@ -1,28 +1,28 @@
-/*
-
-	Derby - Class org.apache.derby.ui.launch.StartDerbyServerLaunchConfigurationDelegate
-	
-	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed 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.derby.ui.launch;
-
-import org.eclipse.jdt.launching.JavaLaunchDelegate;
-
-public class StartDerbyServerLaunchConfigurationDelegate extends
-		JavaLaunchDelegate {
-	
-}
+/*
+
+	Derby - Class org.apache.derby.ui.launch.StartDerbyServerLaunchConfigurationDelegate
+	
+	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+	
+	Licensed 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.derby.ui.launch;
+
+import org.eclipse.jdt.launching.JavaLaunchDelegate;
+
+public class StartDerbyServerLaunchConfigurationDelegate extends
+		JavaLaunchDelegate {
+	
+}

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java Fri Oct 28 04:51:50 2005
@@ -1,29 +1,29 @@
-/*
-
-	Derby - Class org.apache.derby.ui.launch.StopDerbyServerLaunchConfigurationDelegate
-	
-	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed 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.derby.ui.launch;
-
-import org.eclipse.jdt.launching.JavaLaunchDelegate;
-
-
-public class StopDerbyServerLaunchConfigurationDelegate extends
-		JavaLaunchDelegate {
-
-}
+/*
+
+	Derby - Class org.apache.derby.ui.launch.StopDerbyServerLaunchConfigurationDelegate
+	
+	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+	
+	Licensed 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.derby.ui.launch;
+
+import org.eclipse.jdt.launching.JavaLaunchDelegate;
+
+
+public class StopDerbyServerLaunchConfigurationDelegate extends
+		JavaLaunchDelegate {
+
+}

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java Fri Oct 28 04:51:50 2005
@@ -1,29 +1,29 @@
-/*
-
-	Derby - Class org.apache.derby.ui.launch.SysInfoDerbyLaunchConfigurationDelegate
-	
-	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed 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.derby.ui.launch;
-
-import org.eclipse.jdt.launching.JavaLaunchDelegate;
-
-
-public class SysInfoDerbyLaunchConfigurationDelegate extends
-		JavaLaunchDelegate {
-
-}
+/*
+
+	Derby - Class org.apache.derby.ui.launch.SysInfoDerbyLaunchConfigurationDelegate
+	
+	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+	
+	Licensed 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.derby.ui.launch;
+
+import org.eclipse.jdt.launching.JavaLaunchDelegate;
+
+
+public class SysInfoDerbyLaunchConfigurationDelegate extends
+		JavaLaunchDelegate {
+
+}

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/nature/DerbyNature.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/nature/DerbyNature.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/nature/DerbyNature.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/nature/DerbyNature.java Fri Oct 28 04:51:50 2005
@@ -1,46 +1,46 @@
-/*
-
-	Derby - Class org.apache.derby.ui.nature.DerbyNature
-	
-	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
-	
-	Licensed 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.derby.ui.nature;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-
-public class DerbyNature implements IProjectNature {
-	private IProject project = null;
-	
-	public DerbyNature() {
-	}
-
-	public void configure() throws CoreException {
-	}
-
-	public void deconfigure() throws CoreException {
-	}
-
-	public IProject getProject()  {
-		return project;
-	}
-
-	public void setProject(IProject project)  {
-		this.project = project;
-	}
-}
+/*
+
+	Derby - Class org.apache.derby.ui.nature.DerbyNature
+	
+	Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+	
+	Licensed 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.derby.ui.nature;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectNature;
+
+public class DerbyNature implements IProjectNature {
+	private IProject project = null;
+	
+	public DerbyNature() {
+	}
+
+	public void configure() throws CoreException {
+	}
+
+	public void deconfigure() throws CoreException {
+	}
+
+	public IProject getProject()  {
+		return project;
+	}
+
+	public void setProject(IProject project)  {
+		this.project = project;
+	}
+}

Propchange: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/nature/DerbyNature.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/AddDerbyNature.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/AddDerbyNature.java?rev=329187&r1=329186&r2=329187&view=diff
==============================================================================
--- db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/AddDerbyNature.java (original)
+++ db/derby/code/trunk/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/AddDerbyNature.java Fri Oct 28 04:51:50 2005
@@ -1,158 +1,158 @@
-/*
- * 
- * Derby - Class org.apache.derby.ui.popup.actions.AddDerbyNature
- * 
- * Copyright 2002, 2004 The Apache Software Foundation or its licensors, as
- * applicable.
- * 
- * Licensed 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.derby.ui.popup.actions;
-
-import org.apache.derby.ui.common.CommonNames;
-import org.apache.derby.ui.common.Messages;
-import org.apache.derby.ui.util.DerbyUtils;
-import org.apache.derby.ui.util.Logger;
-import org.apache.derby.ui.util.SelectionUtil;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.ApplicationWindow;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-public class AddDerbyNature implements IObjectActionDelegate
-{
-
-    private IJavaProject currentJavaProject;
-    private IProject currentProject;
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
-     *      org.eclipse.ui.IWorkbenchPart)
-     */
-    public void setActivePart(IAction action, IWorkbenchPart targetPart)
-    {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
-    public void run(IAction action)
-    {
-        IWorkbenchWindow window = PlatformUI.getWorkbench()
-                .getActiveWorkbenchWindow();
-        Cursor waitCursor = new Cursor(window.getShell().getDisplay(),
-                SWT.CURSOR_WAIT);
-        try
-        {
-            window.getShell().setCursor(waitCursor);
-            ((ApplicationWindow) window).setStatus(Messages.ADDING_NATURE);
-
-            //new way
-            if (currentJavaProject == null)
-            {
-                // if the java nature is not present
-                // it must be added, along with the Derby nature
-                IProjectDescription description = currentProject
-                        .getDescription();
-                String[] natureIds = description.getNatureIds();
-                String[] newNatures = new String[natureIds.length + 2];
-                System.arraycopy(natureIds, 0, newNatures, 0, natureIds.length);
-                newNatures[newNatures.length - 2] = JavaCore.NATURE_ID;
-                newNatures[newNatures.length - 1] = CommonNames.DERBY_NATURE;
-                description.setNatureIds(newNatures);
-                currentProject.setDescription(description, null);
-
-                currentJavaProject = (IJavaProject) JavaCore
-                        .create((IProject) currentProject);
-            }
-            else
-            {
-                //add the derby nature, the java nature is already present
-                IProjectDescription description = currentJavaProject
-                        .getProject().getDescription();
-                String[] natures = description.getNatureIds();
-                String[] newNatures = new String[natures.length + 1];
-                System.arraycopy(natures, 0, newNatures, 0, natures.length);
-                // must prefix with plugin id
-                newNatures[natures.length] = CommonNames.DERBY_NATURE;
-                description.setNatureIds(newNatures);
-                currentJavaProject.getProject().setDescription(description,
-                        null);
-            }
-
-            IClasspathEntry[] rawClasspath = currentJavaProject
-                    .getRawClasspath();
-
-            currentJavaProject.setRawClasspath(DerbyUtils
-                    .addDerbyJars(rawClasspath), null);
-
-            // refresh project so user sees new files, libraries, etc
-            currentJavaProject.getProject().refreshLocal(
-                    IResource.DEPTH_INFINITE, null);
-            ((ApplicationWindow) window).setStatus(Messages.DERBY_NATURE_ADDED);
-
-        } catch ( Exception e)
-        {
-            Logger.log(Messages.ERROR_ADDING_NATURE + " '"
-                    + currentJavaProject.getProject().getName() + "' : " + e,
-                    IStatus.ERROR);
-            Shell shell = new Shell();
-            MessageDialog.openInformation(shell, CommonNames.PLUGIN_NAME,
-                    Messages.ERROR_ADDING_NATURE + ":\n"
-                            + SelectionUtil.getStatusMessages(e));
-        } finally
-        {
-            window.getShell().setCursor(null);
-            waitCursor.dispose();
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-     *      org.eclipse.jface.viewers.ISelection)
-     */
-    public void selectionChanged(IAction action, ISelection selection)
-    {
-        currentJavaProject = SelectionUtil.findSelectedJavaProject(selection);
-
-        if (currentJavaProject == null)
-        {
-            currentProject = org.apache.derby.ui.util.SelectionUtil
-                    .findSelectedProject(selection);
-        }
-
-    }
-
+/*
+ * 
+ * Derby - Class org.apache.derby.ui.popup.actions.AddDerbyNature
+ * 
+ * Copyright 2002, 2004 The Apache Software Foundation or its licensors, as
+ * applicable.
+ * 
+ * Licensed 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.derby.ui.popup.actions;
+
+import org.apache.derby.ui.common.CommonNames;
+import org.apache.derby.ui.common.Messages;
+import org.apache.derby.ui.util.DerbyUtils;
+import org.apache.derby.ui.util.Logger;
+import org.apache.derby.ui.util.SelectionUtil;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.window.ApplicationWindow;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+
+public class AddDerbyNature implements IObjectActionDelegate
+{
+
+    private IJavaProject currentJavaProject;
+    private IProject currentProject;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
+     *      org.eclipse.ui.IWorkbenchPart)
+     */
+    public void setActivePart(IAction action, IWorkbenchPart targetPart)
+    {
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+     */
+    public void run(IAction action)
+    {
+        IWorkbenchWindow window = PlatformUI.getWorkbench()
+                .getActiveWorkbenchWindow();
+        Cursor waitCursor = new Cursor(window.getShell().getDisplay(),
+                SWT.CURSOR_WAIT);
+        try
+        {
+            window.getShell().setCursor(waitCursor);
+            ((ApplicationWindow) window).setStatus(Messages.ADDING_NATURE);
+
+            //new way
+            if (currentJavaProject == null)
+            {
+                // if the java nature is not present
+                // it must be added, along with the Derby nature
+                IProjectDescription description = currentProject
+                        .getDescription();
+                String[] natureIds = description.getNatureIds();
+                String[] newNatures = new String[natureIds.length + 2];
+                System.arraycopy(natureIds, 0, newNatures, 0, natureIds.length);
+                newNatures[newNatures.length - 2] = JavaCore.NATURE_ID;
+                newNatures[newNatures.length - 1] = CommonNames.DERBY_NATURE;
+                description.setNatureIds(newNatures);
+                currentProject.setDescription(description, null);
+
+                currentJavaProject = (IJavaProject) JavaCore
+                        .create((IProject) currentProject);
+            }
+            else
+            {
+                //add the derby nature, the java nature is already present
+                IProjectDescription description = currentJavaProject
+                        .getProject().getDescription();
+                String[] natures = description.getNatureIds();
+                String[] newNatures = new String[natures.length + 1];
+                System.arraycopy(natures, 0, newNatures, 0, natures.length);
+                // must prefix with plugin id
+                newNatures[natures.length] = CommonNames.DERBY_NATURE;
+                description.setNatureIds(newNatures);
+                currentJavaProject.getProject().setDescription(description,
+                        null);
+            }
+
+            IClasspathEntry[] rawClasspath = currentJavaProject
+                    .getRawClasspath();
+
+            currentJavaProject.setRawClasspath(DerbyUtils
+                    .addDerbyJars(rawClasspath), null);
+
+            // refresh project so user sees new files, libraries, etc
+            currentJavaProject.getProject().refreshLocal(
+                    IResource.DEPTH_INFINITE, null);
+            ((ApplicationWindow) window).setStatus(Messages.DERBY_NATURE_ADDED);
+
+        } catch ( Exception e)
+        {
+            Logger.log(Messages.ERROR_ADDING_NATURE + " '"
+                    + currentJavaProject.getProject().getName() + "' : " + e,
+                    IStatus.ERROR);
+            Shell shell = new Shell();
+            MessageDialog.openInformation(shell, CommonNames.PLUGIN_NAME,
+                    Messages.ERROR_ADDING_NATURE + ":\n"
+                            + SelectionUtil.getStatusMessages(e));
+        } finally
+        {
+            window.getShell().setCursor(null);
+            waitCursor.dispose();
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
+     *      org.eclipse.jface.viewers.ISelection)
+     */
+    public void selectionChanged(IAction action, ISelection selection)
+    {
+        currentJavaProject = SelectionUtil.findSelectedJavaProject(selection);
+
+        if (currentJavaProject == null)
+        {
+            currentProject = org.apache.derby.ui.util.SelectionUtil
+                    .findSelectedProject(selection);
+        }
+
+    }
+
 }



Mime
View raw message