You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2015/07/31 07:36:30 UTC
zest-java git commit: Groovy support isn't working nicely with IDEA.
First fix the build, then worry about how it should be done instead.
Repository: zest-java
Updated Branches:
refs/heads/develop 4bc3e9c41 -> 7e2f74083
Groovy support isn't working nicely with IDEA. First fix the build, then worry about how it should be done instead.
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/7e2f7408
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/7e2f7408
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/7e2f7408
Branch: refs/heads/develop
Commit: 7e2f74083f733b016d3eb3f1086cfd0d54388cae
Parents: 4bc3e9c
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Fri Jul 31 13:36:17 2015 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Fri Jul 31 13:36:17 2015 +0800
----------------------------------------------------------------------
.../apache/zest/library/groovy/GroovyMixin.java | 7 +++--
.../library/groovy/HelloSpeakerMixin.groovy | 5 +++-
.../zest/library/groovy/HelloSpeaker.groovy | 27 ++++++++++++++++++++
.../library/groovy/HelloSpeaker.sayHello.groovy | 3 ++-
.../apache/zest/library/groovy/Mixin1.groovy | 24 +++++++++++++++++
.../library/groovy/support/HelloSpeaker.groovy | 26 -------------------
.../zest/library/groovy/support/Mixin1.groovy | 23 -----------------
7 files changed, 60 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/7e2f7408/libraries/lang-groovy/src/main/java/org/apache/zest/library/groovy/GroovyMixin.java
----------------------------------------------------------------------
diff --git a/libraries/lang-groovy/src/main/java/org/apache/zest/library/groovy/GroovyMixin.java b/libraries/lang-groovy/src/main/java/org/apache/zest/library/groovy/GroovyMixin.java
index 8431c08..5aa82e9 100644
--- a/libraries/lang-groovy/src/main/java/org/apache/zest/library/groovy/GroovyMixin.java
+++ b/libraries/lang-groovy/src/main/java/org/apache/zest/library/groovy/GroovyMixin.java
@@ -56,20 +56,19 @@ public class GroovyMixin
implements InvocationHandler
{
- private @This
- Composite me;
+ @This
+ private Composite me;
+
private final Map<Class, GroovyObject> groovyObjects;
public static class AppliesTo
implements AppliesToFilter
{
-
@Override
public boolean appliesTo( Method method, Class compositeType, Class mixin, Class modelClass )
{
return getFunctionResource( method ) != null;
}
-
}
public GroovyMixin()
http://git-wip-us.apache.org/repos/asf/zest-java/blob/7e2f7408/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
----------------------------------------------------------------------
diff --git a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
index b360211..42136f6 100644
--- a/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
+++ b/libraries/lang-groovy/src/test/groovy/org/apache/zest/library/groovy/HelloSpeakerMixin.groovy
@@ -18,7 +18,10 @@
package org.apache.zest.library.groovy;
// START SNIPPET: direct
-public class HelloSpeakerMixin implements HelloSpeaker {
+public class HelloSpeakerMixin
+ implements HelloSpeaker
+{
+
public String sayHello( String name ) {
"Hello $name!"
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/7e2f7408/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.groovy
----------------------------------------------------------------------
diff --git a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.groovy b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.groovy
new file mode 100644
index 0000000..7a53efb
--- /dev/null
+++ b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.groovy
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2015 the original author or authors
+ *
+ * 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.zest.library.groovy
+
+// START SNIPPET: script
+class HelloSpeaker {
+ def This
+ def sayHello( name ) {
+ "Hello $name!".toString()
+ }
+}
+// END SNIPPET: script
http://git-wip-us.apache.org/repos/asf/zest-java/blob/7e2f7408/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.sayHello.groovy
----------------------------------------------------------------------
diff --git a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.sayHello.groovy b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.sayHello.groovy
index 4415067..5b19f34 100644
--- a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.sayHello.groovy
+++ b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/HelloSpeaker.sayHello.groovy
@@ -1,4 +1,3 @@
-package org.apache.zest.library.groovy
/*
* Copyright (c) 2015 the original author or authors
*
@@ -16,6 +15,8 @@ package org.apache.zest.library.groovy
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.zest.library.groovy
+
// START SNIPPET: script
"Hello ${args[0]}!".toString()
// END SNIPPET: script
http://git-wip-us.apache.org/repos/asf/zest-java/blob/7e2f7408/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/Mixin1.groovy
----------------------------------------------------------------------
diff --git a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/Mixin1.groovy b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/Mixin1.groovy
new file mode 100644
index 0000000..d15b48c
--- /dev/null
+++ b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/Mixin1.groovy
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2007 Rickard Öberg
+ * 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.zest.library.groovy
+
+public class Mixin1
+{
+ def This
+ def counter = 0
+
+ public String do1()
+ {
+ counter = counter + 1
+ return "do1() in Groovy:" + counter
+ }
+}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/7e2f7408/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/HelloSpeaker.groovy
----------------------------------------------------------------------
diff --git a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/HelloSpeaker.groovy b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/HelloSpeaker.groovy
deleted file mode 100644
index 69e1bd1..0000000
--- a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/HelloSpeaker.groovy
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.zest.library.groovy.support
-/*
- * Copyright (c) 2015 the original author or authors
- *
- * 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.
- */
-// START SNIPPET: script
-class HelloSpeaker {
- def This
- def sayHello( name ) {
- "Hello $name!".toString()
- }
-}
-// END SNIPPET: script
http://git-wip-us.apache.org/repos/asf/zest-java/blob/7e2f7408/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/Mixin1.groovy
----------------------------------------------------------------------
diff --git a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/Mixin1.groovy b/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/Mixin1.groovy
deleted file mode 100644
index 3e985d9..0000000
--- a/libraries/lang-groovy/src/test/resources/org/apache/zest/library/groovy/support/Mixin1.groovy
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.apache.zest.library.groovy.support
-/*
- * Copyright 2007 Rickard Öberg
- * 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.
-*/
-public class Mixin1
-{
- def This
- def counter = 0
-
- public String do1()
- {
- counter = counter + 1
- return "do1() in Groovy:" + counter
- }
-}