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 2012/02/23 12:57:54 UTC
svn commit: r1292756 [4/4] - in /incubator/openmeetings/trunk/singlewebapp:
./ src/red5-screenshare/org/red5/screen/webstart/
src/red5-screenshare/org/red5/screen/webstart/gui/
src/red5-screenshare/org/red5/screen/webstart/tgui/ src/templates/
Modified: incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenWidthMouseListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenWidthMouseListener.java?rev=1292756&r1=1292755&r2=1292756&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenWidthMouseListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenWidthMouseListener.java Thu Feb 23 11:57:54 2012
@@ -20,35 +20,34 @@ package org.red5.screen.webstart.gui;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
-import javax.swing.event.MouseInputAdapter;
-import org.red5.screen.webstart.ScreenShare;
+import javax.swing.event.MouseInputAdapter;
public class VirtualScreenWidthMouseListener extends MouseInputAdapter {
-
+ private VirtualScreen vs;
private double x = 0;
+ public VirtualScreenWidthMouseListener(VirtualScreen vs) {
+ this.vs = vs;
+ }
+
public void mouseEntered(MouseEvent e) {
- // TODO Auto-generated method stub
- ScreenShare.instance.t.setCursor( Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR) ) ;
+ vs.css.t.setCursor( Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR) ) ;
}
public void mouseExited(MouseEvent e) {
- // TODO Auto-generated method stub
- ScreenShare.instance.t.setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) ) ;
+ vs.css.t.setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) ) ;
}
public void mousePressed(MouseEvent e) {
- // TODO Auto-generated method stub
- VirtualScreen.instance.showWarning=false;
+ vs.showWarning=false;
this.x = e.getX();
// System.out.println(this.x+" "+this.y);
}
public void mouseReleased(MouseEvent e) {
- // TODO Auto-generated method stub
- VirtualScreen.instance.showWarning=true;
+ vs.showWarning=true;
}
public void mouseDragged(MouseEvent e) {
@@ -59,11 +58,11 @@ public class VirtualScreenWidthMouseList
//System.out.println(newX+" "+newWidth);
if ((VirtualScreenBean.vScreenSpinnerX+newWidth)<=VirtualScreenBean.screenWidthMax) {
- VirtualScreen.instance.doUpdateBounds=false;
- ScreenShare.instance.jVScreenWidthSpin.setValue(newWidth);
- VirtualScreen.instance.doUpdateBounds=true;
- VirtualScreen.instance.updateVScreenBounds();
- VirtualScreen.instance.calcRescaleFactors();
+ vs.doUpdateBounds=false;
+ vs.css.jVScreenWidthSpin.setValue(newWidth);
+ vs.doUpdateBounds=true;
+ vs.updateVScreenBounds();
+ vs.calcRescaleFactors();
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenXMouseListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenXMouseListener.java?rev=1292756&r1=1292755&r2=1292756&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenXMouseListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenXMouseListener.java Thu Feb 23 11:57:54 2012
@@ -20,34 +20,33 @@ package org.red5.screen.webstart.gui;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
-import javax.swing.event.MouseInputAdapter;
-import org.red5.screen.webstart.ScreenShare;
+import javax.swing.event.MouseInputAdapter;
public class VirtualScreenXMouseListener extends MouseInputAdapter {
-
+ private VirtualScreen vs;
private double x = 0;
+ public VirtualScreenXMouseListener(VirtualScreen vs) {
+ this.vs = vs;
+ }
+
public void mouseEntered(MouseEvent e) {
- // TODO Auto-generated method stub
- ScreenShare.instance.t.setCursor( Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR) ) ;
+ vs.css.t.setCursor( Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR) ) ;
}
public void mouseExited(MouseEvent e) {
- // TODO Auto-generated method stub
- ScreenShare.instance.t.setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) ) ;
+ vs.css.t.setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) ) ;
}
public void mousePressed(MouseEvent e) {
- // TODO Auto-generated method stub
- VirtualScreen.instance.showWarning=false;
+ vs.showWarning=false;
this.x = e.getX();
}
public void mouseReleased(MouseEvent e) {
- // TODO Auto-generated method stub
- VirtualScreen.instance.showWarning=true;
+ vs.showWarning=true;
}
public void mouseDragged(MouseEvent e) {
@@ -58,12 +57,12 @@ public class VirtualScreenXMouseListener
//System.out.println(newX+" "+newXPosition+" "+newWidth);
if (newXPosition>=0 && newWidth>=0) {
- VirtualScreen.instance.doUpdateBounds=false;
- ScreenShare.instance.jVScreenXSpin.setValue(newXPosition);
- ScreenShare.instance.jVScreenWidthSpin.setValue(newWidth);
- VirtualScreen.instance.doUpdateBounds=true;
- VirtualScreen.instance.updateVScreenBounds();
- VirtualScreen.instance.calcRescaleFactors();
+ vs.doUpdateBounds=false;
+ vs.css.jVScreenXSpin.setValue(newXPosition);
+ vs.css.jVScreenWidthSpin.setValue(newWidth);
+ vs.doUpdateBounds=true;
+ vs.updateVScreenBounds();
+ vs.calcRescaleFactors();
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenYMouseListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenYMouseListener.java?rev=1292756&r1=1292755&r2=1292756&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenYMouseListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/red5-screenshare/org/red5/screen/webstart/gui/VirtualScreenYMouseListener.java Thu Feb 23 11:57:54 2012
@@ -20,34 +20,33 @@ package org.red5.screen.webstart.gui;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
-import javax.swing.event.MouseInputAdapter;
-import org.red5.screen.webstart.ScreenShare;
+import javax.swing.event.MouseInputAdapter;
public class VirtualScreenYMouseListener extends MouseInputAdapter {
-
+ private VirtualScreen vs;
private double y = 0;
+ public VirtualScreenYMouseListener(VirtualScreen vs) {
+ this.vs = vs;
+ }
+
public void mouseEntered(MouseEvent e) {
- // TODO Auto-generated method stub
- ScreenShare.instance.t.setCursor( Cursor.getPredefinedCursor(Cursor.N_RESIZE_CURSOR) ) ;
+ vs.css.t.setCursor( Cursor.getPredefinedCursor(Cursor.N_RESIZE_CURSOR) ) ;
}
public void mouseExited(MouseEvent e) {
- // TODO Auto-generated method stub
- ScreenShare.instance.t.setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) ) ;
+ vs.css.t.setCursor( Cursor.getPredefinedCursor( Cursor.DEFAULT_CURSOR ) ) ;
}
public void mousePressed(MouseEvent e) {
- // TODO Auto-generated method stub
- VirtualScreen.instance.showWarning=false;
+ vs.showWarning=false;
this.y = e.getY();
// System.out.println(this.x+" "+this.y);
}
public void mouseReleased(MouseEvent e) {
- // TODO Auto-generated method stub
- VirtualScreen.instance.showWarning=true;
+ vs.showWarning=true;
}
public void mouseDragged(MouseEvent e) {
@@ -59,12 +58,12 @@ public class VirtualScreenYMouseListener
// System.out.println(delta+" "+newYPosition+" "+newHeight);
if (newYPosition>=0 && newHeight>=0) {
- VirtualScreen.instance.doUpdateBounds=false;
- ScreenShare.instance.jVScreenYSpin.setValue(newYPosition);
- ScreenShare.instance.jVScreenHeightSpin.setValue(newHeight);
- VirtualScreen.instance.doUpdateBounds=true;
- VirtualScreen.instance.updateVScreenBounds();
- VirtualScreen.instance.calcRescaleFactors();
+ vs.doUpdateBounds=false;
+ vs.css.jVScreenYSpin.setValue(newYPosition);
+ vs.css.jVScreenHeightSpin.setValue(newHeight);
+ vs.doUpdateBounds=true;
+ vs.updateVScreenBounds();
+ vs.calcRescaleFactors();
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm?rev=1292756&r1=1292755&r2=1292756&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm Thu Feb 23 11:57:54 2012
@@ -35,11 +35,15 @@ limitations under the License.
<jar href="logback-core-0.9.28.jar"/>
<jar href="red5.jar"/>
<jar href="red5-screenshare.jar"/>
+ <jar href="org.springframework.core-3.0.6.RELEASE.jar" />
<jar href="org.springframework.context-3.0.6.RELEASE.jar" />
<jar href="mina-core-2.0.4.jar" />
<jar href="slf4j-api-1.6.1.jar" />
<jar href="httpclient-4.1.2.jar" />
<jar href="httpcore-4.1.3.jar" />
+ <jar href="bcprov-jdk16-145.jar" />
+ <jar href="ehcache-core-2.5.0.jar" />
+ <jar href="commons-beanutils-1.8.3.jar" />
</resources>
<application-desc main-class='$startUpClass'>
<argument>$red5-host</argument>