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 2014/03/27 18:13:50 UTC

svn commit: r1582407 - in /openmeetings: branches/3.0.x/docs/ branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/ branches/3.0.x/xdocs/stylesheets/ trunk/singlewebapp/docs/ trunk/singlewebapp/src/screenshare/java/org/apache/ope...

Author: solomax
Date: Thu Mar 27 17:13:50 2014
New Revision: 1582407

URL: http://svn.apache.org/r1582407
Log:
Code clean-up compilation warnings are removed

Modified:
    openmeetings/branches/3.0.x/docs/index.html
    openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
    openmeetings/branches/3.0.x/xdocs/stylesheets/site.vsl
    openmeetings/trunk/singlewebapp/docs/index.html
    openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
    openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl

Modified: openmeetings/branches/3.0.x/docs/index.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/docs/index.html?rev=1582407&r1=1582406&r2=1582407&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/docs/index.html (original)
+++ openmeetings/branches/3.0.x/docs/index.html Thu Mar 27 17:13:50 2014
@@ -509,7 +509,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/Features_Screen_Conference_Room_Thumb.png">
 								<img src="images/Features_Screen_Conference_Room_Thumb.png" alt="" width="250" 
-									height="175" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -538,12 +538,12 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/desktopsharing.png">
 								<img src="images/desktopsharing.png" alt="" width="140" 
-									height="150" />
+									 />
 							</a>
 																								<p>
 							<a class="group1 fancybox-buttons" href="images/recordings_timeleine.png">
 								<img src="images/recordings_timeleine.png" alt="" width="200" 
-									height="115" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -581,7 +581,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/file_smal.png">
 								<img src="images/file_smal.png" alt="" width="135" 
-									height="200" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -622,7 +622,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/right_management.png">
 								<img src="images/right_management.png" alt="" width="135" 
-									height="216" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -668,12 +668,12 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/whiteboard.png">
 								<img src="images/whiteboard.png" alt="" width="240" 
-									height="165" />
+									 />
 							</a>
 																								<p>
 							<a class="group1 fancybox-buttons" href="images/chat.png">
 								<img src="images/chat.png" alt="" width="240" 
-									height="68" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -716,7 +716,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/dashboard.png">
 								<img src="images/dashboard.png" alt="" width="250" 
-									height="130" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -748,7 +748,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/privat_messages.png">
 								<img src="images/privat_messages.png" alt="" width="230" 
-									height="125" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -775,7 +775,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/calendar.png">
 								<img src="images/calendar.png" alt="" width="200" 
-									height="115" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -803,7 +803,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/poll.png">
 								<img src="images/poll.png" alt="" width="250" 
-									height="250" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -827,7 +827,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/backup.png">
 								<img src="images/backup.png" alt="" width="250" 
-									height="$items.getAttribute("height").getValue()" />
+									 />
 							</a>
 																										</td>
 				<td>

Modified: openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java?rev=1582407&r1=1582406&r2=1582407&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java (original)
+++ openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java Thu Mar 27 17:13:50 2014
@@ -123,7 +123,7 @@ final class CaptureScreen extends Thread
 					if (f != null) {
 						try {
 							timestamp += timeBetweenFrames;
-							pushVideo(f, (int)timestamp);
+							pushVideo(f, timestamp);
 							if (log.isTraceEnabled()) {
 								log.trace("Sending video, timestamp: " + timestamp);
 							}

Modified: openmeetings/branches/3.0.x/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/xdocs/stylesheets/site.vsl?rev=1582407&r1=1582406&r2=1582407&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/xdocs/stylesheets/site.vsl (original)
+++ openmeetings/branches/3.0.x/xdocs/stylesheets/site.vsl Thu Mar 27 17:13:50 2014
@@ -55,7 +55,7 @@
 							<p>
 							<a class="group1 fancybox-buttons" href="$items.getAttribute("fullhref").getValue()">
 								<img src="$items.getAttribute("href").getValue()" alt="" width="$items.getAttribute("width").getValue()" 
-									height="$items.getAttribute("height").getValue()" />
+									#if ($items.hasAttribute("height")) height="$items.getAttribute("height").getValue()" #end />
 							</a>
 						#end
 					#end

Modified: openmeetings/trunk/singlewebapp/docs/index.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/index.html?rev=1582407&r1=1582406&r2=1582407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/index.html (original)
+++ openmeetings/trunk/singlewebapp/docs/index.html Thu Mar 27 17:13:50 2014
@@ -509,7 +509,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/Features_Screen_Conference_Room_Thumb.png">
 								<img src="images/Features_Screen_Conference_Room_Thumb.png" alt="" width="250" 
-									height="175" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -538,12 +538,12 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/desktopsharing.png">
 								<img src="images/desktopsharing.png" alt="" width="140" 
-									height="150" />
+									 />
 							</a>
 																								<p>
 							<a class="group1 fancybox-buttons" href="images/recordings_timeleine.png">
 								<img src="images/recordings_timeleine.png" alt="" width="200" 
-									height="115" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -581,7 +581,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/file_smal.png">
 								<img src="images/file_smal.png" alt="" width="135" 
-									height="200" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -622,7 +622,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/right_management.png">
 								<img src="images/right_management.png" alt="" width="135" 
-									height="216" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -668,12 +668,12 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/whiteboard.png">
 								<img src="images/whiteboard.png" alt="" width="240" 
-									height="165" />
+									 />
 							</a>
 																								<p>
 							<a class="group1 fancybox-buttons" href="images/chat.png">
 								<img src="images/chat.png" alt="" width="240" 
-									height="68" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -716,7 +716,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/dashboard.png">
 								<img src="images/dashboard.png" alt="" width="250" 
-									height="130" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -748,7 +748,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/privat_messages.png">
 								<img src="images/privat_messages.png" alt="" width="230" 
-									height="125" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -775,7 +775,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/calendar.png">
 								<img src="images/calendar.png" alt="" width="200" 
-									height="115" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -803,7 +803,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/poll.png">
 								<img src="images/poll.png" alt="" width="250" 
-									height="250" />
+									 />
 							</a>
 																										</td>
 				<td>
@@ -827,7 +827,7 @@
 																		<p>
 							<a class="group1 fancybox-buttons" href="images/backup.png">
 								<img src="images/backup.png" alt="" width="250" 
-									height="$items.getAttribute("height").getValue()" />
+									 />
 							</a>
 																										</td>
 				<td>

Modified: openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java?rev=1582407&r1=1582406&r2=1582407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java (original)
+++ openmeetings/trunk/singlewebapp/src/screenshare/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java Thu Mar 27 17:13:50 2014
@@ -123,7 +123,7 @@ final class CaptureScreen extends Thread
 					if (f != null) {
 						try {
 							timestamp += timeBetweenFrames;
-							pushVideo(f, (int)timestamp);
+							pushVideo(f, timestamp);
 							if (log.isTraceEnabled()) {
 								log.trace("Sending video, timestamp: " + timestamp);
 							}

Modified: openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl?rev=1582407&r1=1582406&r2=1582407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl (original)
+++ openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl Thu Mar 27 17:13:50 2014
@@ -55,7 +55,7 @@
 							<p>
 							<a class="group1 fancybox-buttons" href="$items.getAttribute("fullhref").getValue()">
 								<img src="$items.getAttribute("href").getValue()" alt="" width="$items.getAttribute("width").getValue()" 
-									height="$items.getAttribute("height").getValue()" />
+									#if ($items.hasAttribute("height")) height="$items.getAttribute("height").getValue()" #end />
 							</a>
 						#end
 					#end