Merge branch 'mazter' of https://github.com/SpartanRefactoring/Main i…

…nto mazter
SpartanRefactoring · Jun 4, 2017 · 424cc6d · 424cc6d
2 parents b1fc590 + ecc30f6
commit 424cc6d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/il.org.spartan.spartanizer-plugin/META-INF/MANIFEST.MF b/il.org.spartan.spartanizer-plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Spartan Refactoring
 Bundle-SymbolicName: il.org.spartan.plugin;singleton:=true
-Bundle-Version: 2.12.0
+Bundle-Version: 2.12.1
 Bundle-Activator: il.org.spartan.spartanizer.plugin.Plugin
 Bundle-Vendor: Technion--Israel Institute of Technology
 Require-Bundle: org.eclipse.ui;bundle-version="[3.108.0,4.0.0]",
@@ -56,7 +56,7 @@ Export-Package: .,
  il.org.spartan.spartanizer.leonidas,
  il.org.spartan.spartanizer.meta,
  il.org.spartan.spartanizer.plugin,
- il.org.spartan.spartanizer.plugin.widget;version="2.12.0";
+ il.org.spartan.spartanizer.plugin.widget;version="2.12.1";
   uses:="org.eclipse.jdt.core,
    org.eclipse.jdt.core.dom.rewrite,
    org.eclipse.ltk.core.refactoring,

diff --git a/il.org.spartan.spartanizer-plugin/plugin.xml b/il.org.spartan.spartanizer-plugin/plugin.xml
@@ -507,7 +507,7 @@ http://help.eclipse.org/neon/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Fg
       <command commandId="il.org.spartan.TipsToggleOnOff" style="push" mnemonic="T"/>
     </menu>
     <menu label="Athenize..." mnemonic="A">
-      <command commandId="il.org.spartan.ZoomSelection" style="push" mnemonic="C" label="Current Selection"/>
+      <!--<command commandId="il.org.spartan.ZoomSelection" style="push" mnemonic="C" label="Current Selection"/>-->
       <command commandId="il.org.spartan.ZoomTool" style="push" mnemonic="A" label="Active Window"/>
     </menu>
     <menu label="Zoomer" mnemonic="Z">

diff --git a/il.org.spartan.spartanizer-plugin/spartanizer.xml b/il.org.spartan.spartanizer-plugin/spartanizer.xml
@@ -36,7 +36,7 @@
         <tipper enabled="true" id="2174891198673495792"/>
         <tipper enabled="true" id="-3384979771292763464"/>
         <tipper enabled="true" id="3038270702130812581"/>
-        <tipper enabled="true" id="385127230110121984"/>
+        <tipper enabled="false" id="385127230110121984"/>
         <tipper enabled="true" id="-8750113331278505320"/>
         <tipper enabled="true" id="1956893636347087064"/>
         <tipper enabled="true" id="1319731512145811654"/>

diff --git a/...g.spartan.spartanizer-plugin/src/main/java/il/org/spartan/athenizer/InflaterProvider.java b/...g.spartan.spartanizer-plugin/src/main/java/il/org/spartan/athenizer/InflaterProvider.java
@@ -43,7 +43,7 @@ public static Configuration freshCopyOfAllExpanders() {
             new ToStringExpander(), //
             new TernaryPushupStrings(), //
             new MultiplicationToCast(), //
-            new BooleanExpressionBloater(), //
+            //new BooleanExpressionBloater(), //
             null) //
         .add(PrefixExpression.class, //
             new PrefixToInfix(), //

diff --git a/...spartanizer-plugin/src/main/java/il/org/spartan/spartanizer/traversal/Configurations.java b/...spartanizer-plugin/src/main/java/il/org/spartan/spartanizer/traversal/Configurations.java
@@ -224,7 +224,6 @@ public interface Configurations {
           new BodyDeclarationModifiersSort<>(), //
           new AnnotationSort<>(), //
           new FieldInitializedSerialVersionUIDToHexadecimal(), //
-          new RenameClassFields(), //
           null) //
       .add(CastExpression.class, //
           new CastToDouble2Multiply1(), //