You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/09/27 01:49:13 UTC

svn commit: r1762391 - in /openmeetings/application: branches/3.1.x/openmeetings-flash/ branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/ branches/3.1.x/openmeetings-web/ branches/3.2.x/openmeetings-flash/ b...

Author: solomax
Date: Tue Sep 27 01:49:12 2016
New Revision: 1762391

URL: http://svn.apache.org/viewvc?rev=1762391&view=rev
Log:
no jira: eclipse warnings are fixed

Modified:
    openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
    openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
    openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
    openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
    openmeetings/application/branches/3.2.x/openmeetings-flash/pom.xml
    openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
    openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
    openmeetings/application/branches/3.2.x/openmeetings-web/pom.xml
    openmeetings/application/trunk/openmeetings-flash/pom.xml
    openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
    openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
    openmeetings/application/trunk/openmeetings-web/pom.xml

Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml Tue Sep 27 01:49:12 2016
@@ -158,6 +158,25 @@
 										<ignore></ignore>
 									</action>
 								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-dependency-plugin
+										</artifactId>
+										<versionRange>
+											[2.10,)
+										</versionRange>
+										<goals>
+											<goal>unpack</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
 					</configuration>

Modified: openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java Tue Sep 27 01:49:12 2016
@@ -119,7 +119,7 @@ public class OmKeyEvent {
 		log.debug("sequence:: shift {}, ch {}, orig {} -> key {}({}), map {}", shift, ch == 0 ? ' ' : ch, inKey, key, Integer.toHexString(key), _key);
 	}
 
-	private int getVowel(char ch) {
+	private static int getVowel(char ch) {
 		int vowel = ch;
 		switch(toUpperCase(ch)) {
 			case 'Ö':

Modified: openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java Tue Sep 27 01:49:12 2016
@@ -189,7 +189,7 @@ public class RemoteJob implements Job {
 		}
 	}
 
-	private Point getCoordinates(Map<String, Object> obj) {
+	private static Point getCoordinates(Map<String, Object> obj) {
 		float scaleFactorX = spinnerWidth / (Ampl_factor * resizeX);
 		float scaleFactorY = spinnerHeight / (Ampl_factor * resizeY);
 

Modified: openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml Tue Sep 27 01:49:12 2016
@@ -293,6 +293,7 @@
 										<versionRange>[2.8,)</versionRange>
 										<goals>
 											<goal>copy-dependencies</goal>
+											<goal>copy</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>

Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/pom.xml?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/pom.xml Tue Sep 27 01:49:12 2016
@@ -158,6 +158,25 @@
 										<ignore></ignore>
 									</action>
 								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-dependency-plugin
+										</artifactId>
+										<versionRange>
+											[2.10,)
+										</versionRange>
+										<goals>
+											<goal>unpack</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
 					</configuration>

Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java Tue Sep 27 01:49:12 2016
@@ -119,7 +119,7 @@ public class OmKeyEvent {
 		log.debug("sequence:: shift {}, ch {}, orig {} -> key {}({}), map {}", shift, ch == 0 ? ' ' : ch, inKey, key, Integer.toHexString(key), _key);
 	}
 
-	private int getVowel(char ch) {
+	private static int getVowel(char ch) {
 		int vowel = ch;
 		switch(toUpperCase(ch)) {
 			case 'Ö':

Modified: openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java Tue Sep 27 01:49:12 2016
@@ -189,7 +189,7 @@ public class RemoteJob implements Job {
 		}
 	}
 
-	private Point getCoordinates(Map<String, Object> obj) {
+	private static Point getCoordinates(Map<String, Object> obj) {
 		float scaleFactorX = spinnerWidth / (Ampl_factor * resizeX);
 		float scaleFactorY = spinnerHeight / (Ampl_factor * resizeY);
 

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/pom.xml?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/pom.xml Tue Sep 27 01:49:12 2016
@@ -293,6 +293,7 @@
 										<versionRange>[2.8,)</versionRange>
 										<goals>
 											<goal>copy-dependencies</goal>
+											<goal>copy</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>

Modified: openmeetings/application/trunk/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-flash/pom.xml?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-flash/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-flash/pom.xml Tue Sep 27 01:49:12 2016
@@ -111,6 +111,25 @@
 										<ignore></ignore>
 									</action>
 								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-dependency-plugin
+										</artifactId>
+										<versionRange>
+											[2.10,)
+										</versionRange>
+										<goals>
+											<goal>unpack</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
 					</configuration>

Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/OmKeyEvent.java Tue Sep 27 01:49:12 2016
@@ -119,7 +119,7 @@ public class OmKeyEvent {
 		log.debug("sequence:: shift {}, ch {}, orig {} -> key {}({}), map {}", shift, ch == 0 ? ' ' : ch, inKey, key, Integer.toHexString(key), _key);
 	}
 
-	private int getVowel(char ch) {
+	private static int getVowel(char ch) {
 		int vowel = ch;
 		switch(toUpperCase(ch)) {
 			case 'Ö':

Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java Tue Sep 27 01:49:12 2016
@@ -189,7 +189,7 @@ public class RemoteJob implements Job {
 		}
 	}
 
-	private Point getCoordinates(Map<String, Object> obj) {
+	private static Point getCoordinates(Map<String, Object> obj) {
 		float scaleFactorX = spinnerWidth / (Ampl_factor * resizeX);
 		float scaleFactorY = spinnerHeight / (Ampl_factor * resizeY);
 

Modified: openmeetings/application/trunk/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/pom.xml?rev=1762391&r1=1762390&r2=1762391&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/pom.xml Tue Sep 27 01:49:12 2016
@@ -293,6 +293,7 @@
 										<versionRange>[2.8,)</versionRange>
 										<goals>
 											<goal>copy-dependencies</goal>
+											<goal>copy</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>