Adding options to use blocks in ‘if’ statements and to use the commons-lang3 library.

org.jiayun.commons4e-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.jiayun.commons4e"
       label="Commons4E"
-      version="1.1.11"
+      version="1.2.0"
       provider-name="JiaYun">
    <install-handler/>
 
@@ -103,10 +103,6 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
    </license>
 
-   <url>
-      <update label="Commons4E" url="http://commons4e.berlios.de/updatesite31"/>
-   </url>
-
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.resources"/>
@@ -120,7 +116,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
          id="org.jiayun.commons4e"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.2.0"
          unpack="false"/>
 
 </feature>

org.jiayun.commons4e-site/site.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<site
-      mirrorsURL="http://www.jiayun.org/commons4e/mirrors.xml">
-   <description url="http://commons4e.berlios.de/updatesite31">
-      Commons4E Update Site
-   </description>
-   <feature url="features/org.jiayun.commons4e_1.1.11.jar" id="org.jiayun.commons4e" version="1.1.11">
+<site>
+   <feature url="features/org.jiayun.commons4e_1.2.0.jar" id="org.jiayun.commons4e" version="1.2.0">
       <category name="Commons4E"/>
    </feature>
    <category-def name="Commons4E" label="Commons4E"/>

org.jiayun.commons4e/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: Commons4E
 Bundle-SymbolicName: org.jiayun.commons4e; singleton=true
-Bundle-Version: 1.1.11
+Bundle-Version: 1.2.0
 Bundle-ClassPath: commons4e.jar
 Bundle-Activator: org.jiayun.commons4e.Commons4ePlugin
 Bundle-Vendor: JiaYun

org.jiayun.commons4e/plugin.xml

@@ -2,58 +2,24 @@
 <?eclipse version="3.0"?>
 <plugin>
 
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.jdt.core.IType"
-            id="org.jiayun.commons4e.lang.LangActions">
-         <menu
-               label="Commons4E Lang"
-               path="additions"
-               id="langMenu">
-            <separator name="langGroup"/>
-         </menu>
-         <action
-               label="Generate CompareTo Method..."
-               class="org.jiayun.commons4e.internal.lang.actions.GenerateAction"
-               menubarPath="langMenu/langGroup"
-               id="org.jiayun.commons4e.lang.actions.GenerateCompareToAction"/>
-         <action
-               label="Generate ToString Method..."
-               class="org.jiayun.commons4e.internal.lang.actions.GenerateAction"
-               menubarPath="langMenu/langGroup"
-               id="org.jiayun.commons4e.lang.actions.GenerateToStringAction"/>
-         <action
-               label="Generate Equals and HashCode..."
-               class="org.jiayun.commons4e.internal.lang.actions.GenerateAction"
-               menubarPath="langMenu/langGroup"
-               id="org.jiayun.commons4e.lang.actions.GenerateEqualsHashCodeAction"/>
-      </objectContribution>
-      <viewerContribution
-            targetID="#CompilationUnitEditorContext"
-            id="org.jiayun.commons4e.lang.LangActions">
-         <menu
-               label="Commons4E Lang"
-               path="additions"
-               id="langMenu">
-            <separator name="langGroup"/>
-         </menu>
-         <action
-               label="Generate CompareTo Method..."
-               class="org.jiayun.commons4e.internal.lang.actions.ViewerContributionGenerateAction"
-               menubarPath="langMenu/langGroup"
-               id="org.jiayun.commons4e.lang.actions.GenerateCompareToAction"/>
-         <action
-               label="Generate ToString Method..."
-               class="org.jiayun.commons4e.internal.lang.actions.ViewerContributionGenerateAction"
-               menubarPath="langMenu/langGroup"
-               id="org.jiayun.commons4e.lang.actions.GenerateToStringAction"/>
-         <action
-               label="Generate Equals and HashCode..."
-               class="org.jiayun.commons4e.internal.lang.actions.ViewerContributionGenerateAction"
-               menubarPath="langMenu/langGroup"
-               id="org.jiayun.commons4e.lang.actions.GenerateEqualsHashCodeAction"/>
-      </viewerContribution>
+   <extension point="org.eclipse.ui.commands">
+		<command
+        categoryId="org.eclipse.jdt.ui.category.source"
+        id="org.jiayun.commons4e.lang.actions.GenerateEqualsHashCodeAction"
+        name="Generate Equals and HashCode..."/>
+		<command
+        categoryId="org.eclipse.jdt.ui.category.source"
+        id="org.jiayun.commons4e.lang.actions.GenerateToStringAction"
+        name="Generate ToString Method..."/>
+		<command
+        categoryId="org.eclipse.jdt.ui.category.source"
+        id="org.jiayun.commons4e.lang.actions.GenerateCompareToAction"
+        name="Generate CompareTo Method..."/>
+  <command
+        categoryId="org.eclipse.jdt.ui.category.source"
+        id="org.jiayun.commons4e.lang.actions.Commons4ELangMenu"
+        name="Commons4E Lang">
+  </command>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
@@ -67,5 +33,107 @@
          point="org.eclipse.core.runtime.preferences">
       <initializer class="org.jiayun.commons4e.Commons4ePreferenceInitializer"/>
    </extension>
-
+	<extension point="org.eclipse.ui.bindings">
+		<key
+        commandId="org.jiayun.commons4e.lang.actions.GenerateEqualsHashCodeAction"
+        contextId="org.eclipse.jdt.ui.javaEditorScope"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="Shift+Alt+G H"/>
+  <key
+        commandId="org.jiayun.commons4e.lang.actions.GenerateToStringAction"
+        contextId="org.eclipse.jdt.ui.javaEditorScope"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="Shift+Alt+G S">
+  </key>
+  <key
+        commandId="org.jiayun.commons4e.lang.actions.GenerateCompareToAction"
+        contextId="org.eclipse.jdt.ui.javaEditorScope"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="Shift+Alt+G C">
+  </key>
+  <key
+        commandId="org.jiayun.commons4e.lang.actions.Commons4ELangMenu"
+        contextId="org.eclipse.jdt.ui.javaEditorScope"
+        schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+        sequence="Shift+Alt+G">
+  </key>
+	</extension>
+ <extension
+       point="org.eclipse.ui.handlers">
+    <handler
+          class="org.jiayun.commons4e.internal.lang.handlers.GenerateHandler"
+          commandId="org.jiayun.commons4e.lang.actions.GenerateEqualsHashCodeAction">
+       <activeWhen>
+          <reference
+                definitionId="org.jiayun.commons4e.lang.contribution.inEditor">
+          </reference></activeWhen>
+    </handler>
+    <handler
+          class="org.jiayun.commons4e.internal.lang.handlers.GenerateHandler"
+          commandId="org.jiayun.commons4e.lang.actions.GenerateToStringAction">
+       <activeWhen>
+          <reference
+                definitionId="org.jiayun.commons4e.lang.contribution.inEditor">
+          </reference>
+       </activeWhen>
+    </handler>
+    <handler
+          class="org.jiayun.commons4e.internal.lang.handlers.GenerateHandler"
+          commandId="org.jiayun.commons4e.lang.actions.GenerateCompareToAction">
+       <activeWhen>
+          <reference
+                definitionId="org.jiayun.commons4e.lang.contribution.inEditor">
+          </reference>
+       </activeWhen>
+    </handler>
+ </extension>
+ <extension
+       point="org.eclipse.ui.menus">
+    <menuContribution
+          allPopups="false"
+          locationURI="popup:org.eclipse.ui.popup.any?before=additions">
+       <menu
+             commandId="org.jiayun.commons4e.lang.actions.Commons4ELangMenu"
+             id="langMenu"
+             label="Commons4E Lang">
+          <command
+                commandId="org.jiayun.commons4e.lang.actions.GenerateEqualsHashCodeAction"
+                label="Generate Equals and HashCode..."
+                style="push">
+          </command>
+          <command
+                commandId="org.jiayun.commons4e.lang.actions.GenerateToStringAction"
+                label="Generate ToString Method..."
+                style="push">
+          </command>
+          <command
+                commandId="org.jiayun.commons4e.lang.actions.GenerateCompareToAction"
+                label="Generate CompareTo Method..."
+                style="push">
+          </command>
+          <visibleWhen
+                checkEnabled="false">
+             <reference
+                   definitionId="org.jiayun.commons4e.lang.contribution.inEditor">
+             </reference>
+          </visibleWhen>
+       </menu>
+    </menuContribution>
+ </extension>
+ <extension point="org.eclipse.core.expressions.definitions">
+    <definition id="org.jiayun.commons4e.lang.contribution.inEditor">
+		<and>
+	      <with variable="activeEditorId">
+	           <equals
+	                 value="org.eclipse.jdt.ui.CompilationUnitEditor">
+	           </equals>
+	      </with>
+	      <with variable="activePartId">
+		     <equals
+		           value="org.eclipse.jdt.ui.CompilationUnitEditor">
+		     </equals>
+	      </with>
+        </and>
+    </definition>
+</extension>
 </plugin>