groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwagenleit...@apache.org
Subject [3/3] groovy git commit: Remove jdk5 checks (closes #235)
Date Wed, 06 Jan 2016 23:25:29 GMT
Remove jdk5 checks (closes #235)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f4030994
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f4030994
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f4030994

Branch: refs/heads/master
Commit: f403099421df866174893a794d3f1ef5e6658ba6
Parents: efe8fdb
Author: John Wagenleitner <jwagenleitner@apache.org>
Authored: Tue Jan 5 21:12:51 2016 -0800
Committer: John Wagenleitner <jwagenleitner@apache.org>
Committed: Wed Jan 6 14:19:45 2016 -0800

----------------------------------------------------------------------
 .../main/groovy/groovy/ui/view/GTKDefaults.groovy   | 16 ----------------
 .../org/codehaus/groovy/testng/TestNgRunner.java    |  4 ----
 2 files changed, 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/f4030994/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy
b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy
index 8b16a59..8e16590 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/view/GTKDefaults.groovy
@@ -34,22 +34,6 @@ def fontFamily = prefs.get("fontName", "DejaVu Sans Mono")
 styles.regular[StyleConstants.FontFamily] = fontFamily
 styles[StyleContext.DEFAULT_STYLE][StyleConstants.FontFamily] = fontFamily
 
-// possibly change look and feel
-if (System.properties['java.version'] =~ /^1\.5/) {
-    // GTK wasn't where it needed to be in 1.5, especially with toolbars
-    // use metal instead
-    lookAndFeel('metal', boldFonts:false)
-    
-    // we also need to turn on anti-aliasing ourselves
-    key = InvokerHelper.getProperty('com.sun.java.swing.SwingUtilities2' as Class,
-        'AA_TEXT_PROPERTY_KEY')
-    addAttributeDelegate {builder, node, attributes ->
-        if (node instanceof JComponent) {
-            node.putClientProperty(key, new Boolean(true));
-        }
-    }
-}
-
 // some current distros (Ubuntu 7.10) have broken printing support :(
 // detect it and disable it
 try {

http://git-wip-us.apache.org/repos/asf/groovy/blob/f4030994/subprojects/groovy-testng/src/main/java/org/codehaus/groovy/testng/TestNgRunner.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-testng/src/main/java/org/codehaus/groovy/testng/TestNgRunner.java
b/subprojects/groovy-testng/src/main/java/org/codehaus/groovy/testng/TestNgRunner.java
index f5fe867..fa8dfee 100644
--- a/subprojects/groovy-testng/src/main/java/org/codehaus/groovy/testng/TestNgRunner.java
+++ b/subprojects/groovy-testng/src/main/java/org/codehaus/groovy/testng/TestNgRunner.java
@@ -44,10 +44,6 @@ public class TestNgRunner implements GroovyRunner {
      */
     @SuppressWarnings("unchecked")
     public boolean canRun(Class scriptClass, GroovyClassLoader loader) {
-        char version = System.getProperty("java.version").charAt(2);
-        if (version < '5') {
-            return false;
-        }
         // check if there are appropriate class or method annotations
         // that suggest we have a TestNG test
         boolean isTest = false;


Mime
View raw message