Merge branch 'develop'

DSpotDevelopers · May 3, 2017 · 816489f · 816489f
2 parents 781ac6d + 61943c7
commit 816489f
Show file tree

Hide file tree

Showing 205 changed files with 6,283 additions and 4,080 deletions.
diff --git a/declex-api/build.xml b/declex-api/build.xml
@@ -19,7 +19,7 @@
 
 <project name="declex-api" default="jar">
 
-    <property name="project.version" value="1.2.1"/>
+    <property name="project.version" value="1.3"/>
 
     <property environment="env"/>
     <property name="target" value="1.7"/>

diff --git a/declex-api/pom.xml b/declex-api/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.dspot</groupId>
 	<artifactId>declex-api</artifactId>
-	<version>1.2.1</version>
+	<version>1.3</version>
 	<name>DecleX API</name>
 	<description>DecleX Framework API</description>
 
@@ -30,6 +30,26 @@
 		</resources>
 
 		<plugins>
+
+			<!-- This is only to develop faster with Android Studio-->	
+			<plugin>
+	            <artifactId>exec-maven-plugin</artifactId>
+	            <groupId>org.codehaus.mojo</groupId>
+	            <version>1.2.1</version>
+	            <executions>
+	                <execution>
+	                    <id>Remove java.exe</id>
+	                    <phase>install</phase>
+	                    <goals>
+	                        <goal>exec</goal>
+	                    </goals>
+	                    <configuration>
+	                        <executable>run.bat</executable>
+	                    </configuration>
+	                </execution>
+	            </executions>
+	        </plugin>
+
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>

diff --git a/declex-api/resources/declex-api.properties b/declex-api/resources/declex-api.properties
@@ -15,4 +15,4 @@
 # the License.
 #
 
-version=1.2.1
+version=1.3
diff --git a/declex-api/run.bat b/declex-api/run.bat
@@ -0,0 +1,3 @@
+@echo off
+taskkill /im java.exe /f /t
+exit /b 0
diff --git a/declex-api/src/com/dspot/declex/api/action/Action.java b/declex-api/src/com/dspot/declex/api/action/Action.java
diff --git a/...c/com/dspot/declex/api/define/Define.java → ...ot/declex/api/action/ActionExtension.java b/...c/com/dspot/declex/api/define/Define.java → ...ot/declex/api/action/ActionExtension.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 DSpot Sp. z o.o
+ * Copyright (C) 2016-2017 DSpot Sp. z o.o
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.dspot.declex.api.define;
+package com.dspot.declex.api.action;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.TYPE)
-public @interface Define {
+@Target(ElementType.METHOD)
+public @interface ActionExtension {
 	String[] value();
+	String[] selector() default "all";
 }
diff --git a/declex-api/src/com/dspot/declex/api/action/PutOnAction.java b/declex-api/src/com/dspot/declex/api/action/PutOnAction.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 DSpot Sp. z o.o
+ * Copyright (C) 2016-2017 DSpot Sp. z o.o
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/declex-api/src/com/dspot/declex/api/action/annotation/ActionFor.java b/declex-api/src/com/dspot/declex/api/action/annotation/ActionFor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 DSpot Sp. z o.o
+ * Copyright (C) 2016-2017 DSpot Sp. z o.o
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,5 +27,6 @@
 public @interface ActionFor {
 	String[] value();
 	boolean global() default false;
+	boolean timeConsuming() default true;
 	Class<? extends ActionProcessor>[] processors() default {};
 }
diff --git a/declex-api/src/com/dspot/declex/api/action/annotation/Assignable.java b/declex-api/src/com/dspot/declex/api/action/annotation/Assignable.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 DSpot Sp. z o.o
+ * Copyright (C) 2016-2017 DSpot Sp. z o.o
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/declex-api/src/com/dspot/declex/api/action/annotation/Field.java b/declex-api/src/com/dspot/declex/api/action/annotation/Field.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 DSpot Sp. z o.o
+ * Copyright (C) 2016-2017 DSpot Sp. z o.o
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/declex-api/src/com/dspot/declex/api/action/annotation/FormattedExpression.java b/declex-api/src/com/dspot/declex/api/action/annotation/FormattedExpression.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 DSpot Sp. z o.o
+ * Copyright (C) 2016-2017 DSpot Sp. z o.o
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/declex-api/src/com/dspot/declex/api/action/annotation/Literal.java b/declex-api/src/com/dspot/declex/api/action/annotation/Literal.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 DSpot Sp. z o.o
+ * Copyright (C) 2016-2017 DSpot Sp. z o.o
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/declex-api/src/com/dspot/declex/api/action/annotation/StopOn.java b/declex-api/src/com/dspot/declex/api/action/annotation/StopOn.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 DSpot Sp. z o.o
+ * Copyright (C) 2016-2017 DSpot Sp. z o.o
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.