Author: solomax
Date: Fri Mar 30 11:45:05 2012
New Revision: 1307373
URL: http://svn.apache.org/viewvc?rev=1307373&view=rev
Log:
OPENMEETINGS-98 ScreenSharing: Medium and Low quality fixed; package renamed;
minor code cleanup
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/
- copied from r1307363,
incubator/openmeetings/trunk/singlewebapp/src/org/red5/screen/
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/NumberSpinner.java
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/OpenMeetings-LICENSE.txt
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/RED5-License.txt
incubator/openmeetings/trunk/singlewebapp/WebContent/red5-license.txt
incubator/openmeetings/trunk/singlewebapp/src/org/red5/screen/
Modified:
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/BlankArea.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CommonScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenEncoder.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenKeyListener.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenShareRTMPT.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenV1Encoder.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreen.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenBean.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenHeightMouseListener.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenMouseListener.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenWidthMouseListener.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenXMouseListener.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenYMouseListener.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1307373&r1=1307372&r2=1307373&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Fri Mar 30 11:45:05 2012
@@ -236,7 +236,7 @@
<include name="**" />
<exclude name="**/test/**" />
<exclude name="**/axis/**" />
- <exclude name="org/red5/**" />
+ <exclude name="org/openmeetings/screen/**" />
<exclude name="org/openmeetings/doc/**" />
<exclude name="**/client/**" />
<exclude name="**/*.png" />
@@ -292,7 +292,7 @@
<!-- Screen Share -->
<jar destfile="${screenshare.out.dir}/red5-screenshare.jar">
<fileset dir="${main.out.dir}">
- <include name="org/red5/screen/**" />
+ <include name="org/openmeetings/screen/**" />
</fileset>
<fileset
file="${red5-screenshare.resources}/logback.xml"/>
<manifest>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/BlankArea.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/BlankArea.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/BlankArea.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/BlankArea.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart;
+package org.openmeetings.screen.webstart;
import javax.swing.*;
import java.awt.Dimension;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CommonScreenShare.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CommonScreenShare.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CommonScreenShare.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CommonScreenShare.java
Fri Mar 30 11:45:05 2012
@@ -1,4 +1,4 @@
-package org.red5.screen.webstart;
+package org.openmeetings.screen.webstart;
import java.awt.Color;
import java.awt.Image;
@@ -31,15 +31,15 @@ import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.JLabel;
-import javax.swing.JSpinner;
import org.apache.mina.core.buffer.IoBuffer;
+import org.openmeetings.screen.webstart.gui.NumberSpinner;
+import org.openmeetings.screen.webstart.gui.VirtualScreen;
+import org.openmeetings.screen.webstart.gui.VirtualScreenBean;
+import org.openmeetings.screen.webstart.gui.VirtualScreenBean.ScreenQuality;
import org.red5.io.ITagReader;
import org.red5.io.ITagWriter;
import org.red5.io.utils.ObjectMap;
-import org.red5.screen.webstart.gui.VirtualScreen;
-import org.red5.screen.webstart.gui.VirtualScreenBean;
-import org.red5.screen.webstart.gui.VirtualScreenBean.ScreenQuality;
import org.red5.server.api.event.IEvent;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.net.rtmp.Channel;
@@ -82,18 +82,18 @@ public class CommonScreenShare {
public JButton startButton;
public JButton stopButton;
public JButton exitButton;
- public JSpinner jSpin;
+ public NumberSpinner jSpin;
public JLabel tFieldScreenZoom;
public JLabel blankArea;
public BlankArea virtualScreen;
public JLabel vscreenXLabel;
public JLabel vscreenYLabel;
- public JSpinner jVScreenXSpin;
- public JSpinner jVScreenYSpin;
+ public NumberSpinner jVScreenXSpin;
+ public NumberSpinner jVScreenYSpin;
public JLabel vscreenWidthLabel;
public JLabel vscreenHeightLabel;
- public JSpinner jVScreenWidthSpin;
- public JSpinner jVScreenHeightSpin;
+ public NumberSpinner jVScreenWidthSpin;
+ public NumberSpinner jVScreenHeightSpin;
public JComboBox jVScreenResizeMode;
public JLabel vscreenResizeLabel;
@@ -253,8 +253,8 @@ public class CommonScreenShare {
public void createWindow() {
try {
- ImageIcon start_btn =
createImageIcon("/org/red5/screen/webstart_play.png");
- ImageIcon stop_btn =
createImageIcon("/org/red5/screen/webstart_stop.png");
+ ImageIcon start_btn =
createImageIcon("/org/openmeetings/screen/webstart_play.png");
+ ImageIcon stop_btn =
createImageIcon("/org/openmeetings/screen/webstart_stop.png");
t = new JFrame(this.label730);
contentPane = t.getContentPane();
@@ -364,7 +364,7 @@ public class CommonScreenShare {
// *****
// Background Image
Image im_left = ImageIO.read(getClass()
-
.getResource("/org/red5/screen/background.png"));
+
.getResource("/org/openmeetings/screen/background.png"));
ImageIcon iIconBack = new ImageIcon(im_left);
JLabel jLab = new JLabel(iIconBack);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenEncoder.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenEncoder.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenEncoder.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenEncoder.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart;
+package org.openmeetings.screen.webstart;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/IScreenShare.java
Fri Mar 30 11:45:05 2012
@@ -1,4 +1,4 @@
-package org.red5.screen.webstart;
+package org.openmeetings.screen.webstart;
import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.messaging.IMessage;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenKeyListener.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenKeyListener.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenKeyListener.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenKeyListener.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart;
+package org.openmeetings.screen.webstart;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenShare.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenShare.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenShare.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenShare.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart;
+package org.openmeetings.screen.webstart;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.net.rtmp.Channel;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenShareRTMPT.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenShareRTMPT.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenShareRTMPT.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenShareRTMPT.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart;
+package org.openmeetings.screen.webstart;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.net.rtmp.Channel;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenV1Encoder.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenV1Encoder.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenV1Encoder.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/ScreenV1Encoder.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart;
+package org.openmeetings.screen.webstart;
import java.awt.Graphics2D;
import java.awt.Rectangle;
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/NumberSpinner.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/NumberSpinner.java?rev=1307373&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/NumberSpinner.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/NumberSpinner.java
Fri Mar 30 11:45:05 2012
@@ -0,0 +1,16 @@
+package org.openmeetings.screen.webstart.gui;
+
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+
+public class NumberSpinner extends JSpinner {
+ private static final long serialVersionUID = -1964457022937740633L;
+
+ public NumberSpinner(int value, int min, int max, int step) {
+ super(new SpinnerNumberModel(value, min, max, step));
+ }
+
+ public Integer getValue() {
+ return (Integer)super.getValue();
+ }
+}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreen.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreen.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreen.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreen.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart.gui;
+package org.openmeetings.screen.webstart.gui;
import java.awt.Color;
import java.awt.Dimension;
@@ -31,16 +31,14 @@ import javax.imageio.ImageIO;
import javax.swing.ImageIcon;
import javax.swing.JComboBox;
import javax.swing.JLabel;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import org.red5.screen.webstart.BlankArea;
-import org.red5.screen.webstart.CommonScreenShare;
-import org.red5.screen.webstart.ScreenShare;
-import org.red5.screen.webstart.gui.VirtualScreenBean.ScreenQuality;
+import org.openmeetings.screen.webstart.BlankArea;
+import org.openmeetings.screen.webstart.CommonScreenShare;
+import org.openmeetings.screen.webstart.ScreenShare;
+import org.openmeetings.screen.webstart.gui.VirtualScreenBean.ScreenQuality;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -116,13 +114,13 @@ public class VirtualScreen {
css.vScreenIconDown = new JLabel();
css.vScreenIconDown.setBounds(30+(width/2)-8, 162+height-8, 16,
32);
- Image im_left =
ImageIO.read(ScreenShare.class.getResource("/org/red5/screen/1leftarrow.png"));
+ Image im_left =
ImageIO.read(ScreenShare.class.getResource("/org/openmeetings/screen/1leftarrow.png"));
ImageIcon iIcon1 = new ImageIcon(im_left);
- Image im_right =
ImageIO.read(ScreenShare.class.getResource("/org/red5/screen/1rightarrow.png"));
+ Image im_right =
ImageIO.read(ScreenShare.class.getResource("/org/openmeetings/screen/1rightarrow.png"));
ImageIcon iIcon2 = new ImageIcon(im_right);
- Image im_up =
ImageIO.read(ScreenShare.class.getResource("/org/red5/screen/1uparrow.png"));
+ Image im_up =
ImageIO.read(ScreenShare.class.getResource("/org/openmeetings/screen/1uparrow.png"));
ImageIcon iIcon3 = new ImageIcon(im_up);
- Image im_down =
ImageIO.read(ScreenShare.class.getResource("/org/red5/screen/1downarrow.png"));
+ Image im_down =
ImageIO.read(ScreenShare.class.getResource("/org/openmeetings/screen/1downarrow.png"));
ImageIcon iIcon4 = new ImageIcon(im_down);
JLabel jLab1 = new JLabel(iIcon1);
@@ -205,9 +203,7 @@ public class VirtualScreen {
css.vscreenXLabel.setBounds(250, 170, 150, 24);
css.t.add(css.vscreenXLabel);
- css.jVScreenXSpin = new JSpinner(
- new
SpinnerNumberModel(VirtualScreenBean.vScreenSpinnerX, 0,
VirtualScreenBean.screenWidthMax, 1)
- );
+ css.jVScreenXSpin = new
NumberSpinner(VirtualScreenBean.vScreenSpinnerX, 0,
VirtualScreenBean.screenWidthMax, 1);
css.jVScreenXSpin.setBounds(400, 170, 60, 24);
css.jVScreenXSpin.addChangeListener( new ChangeListener(){
public void stateChanged(ChangeEvent arg0) {
@@ -223,9 +219,7 @@ public class VirtualScreen {
css.vscreenYLabel.setBounds(250, 200, 150, 24);
css.t.add(css.vscreenYLabel);
- css.jVScreenYSpin = new JSpinner(
- new
SpinnerNumberModel(VirtualScreenBean.vScreenSpinnerY, 0,
VirtualScreenBean.screenHeightMax, 1)
- );
+ css.jVScreenYSpin = new
NumberSpinner(VirtualScreenBean.vScreenSpinnerY, 0,
VirtualScreenBean.screenHeightMax, 1);
css.jVScreenYSpin.setBounds(400, 200, 60, 24);
css.jVScreenYSpin.addChangeListener( new ChangeListener(){
public void stateChanged(ChangeEvent arg0) {
@@ -241,9 +235,7 @@ public class VirtualScreen {
css.vscreenWidthLabel.setBounds(250, 240, 150, 24);
css.t.add(css.vscreenWidthLabel);
- css.jVScreenWidthSpin = new JSpinner(
- new
SpinnerNumberModel(VirtualScreenBean.vScreenSpinnerWidth, 0,
VirtualScreenBean.screenWidthMax, 1)
- );
+ css.jVScreenWidthSpin = new
NumberSpinner(VirtualScreenBean.vScreenSpinnerWidth, 0,
VirtualScreenBean.screenWidthMax, 1);
css.jVScreenWidthSpin.setBounds(400, 240, 60, 24);
css.jVScreenWidthSpin.addChangeListener( new ChangeListener(){
public void stateChanged(ChangeEvent arg0) {
@@ -259,9 +251,7 @@ public class VirtualScreen {
css.vscreenHeightLabel.setBounds(250, 270, 150, 24);
css.t.add(css.vscreenHeightLabel);
- css.jVScreenHeightSpin = new JSpinner(
- new
SpinnerNumberModel(VirtualScreenBean.vScreenSpinnerHeight, 0,
VirtualScreenBean.screenHeightMax, 1)
- );
+ css.jVScreenHeightSpin = new
NumberSpinner(VirtualScreenBean.vScreenSpinnerHeight, 0,
VirtualScreenBean.screenHeightMax, 1);
css.jVScreenHeightSpin.setBounds(400, 270, 60, 24);
css.jVScreenHeightSpin.addChangeListener( new ChangeListener(){
public void stateChanged(ChangeEvent arg0) {
@@ -305,19 +295,19 @@ public class VirtualScreen {
*/
void calcRescaleFactors() {
logger.debug("calcRescaleFactors -- ");
- VirtualScreenBean.vScreenResizeX =
Integer.valueOf(css.jVScreenWidthSpin.getValue().toString()).intValue();
- VirtualScreenBean.vScreenResizeY =
Integer.valueOf(css.jVScreenHeightSpin.getValue().toString()).intValue();
+ VirtualScreenBean.vScreenResizeX =
css.jVScreenWidthSpin.getValue();
+ VirtualScreenBean.vScreenResizeY =
css.jVScreenHeightSpin.getValue();
switch (VirtualScreenBean.screenQuality) {
case VeryHigh:
case High:
break;
case Medium:
- VirtualScreenBean.vScreenResizeX *= 1/2;
- VirtualScreenBean.vScreenResizeY *= 2;
+ VirtualScreenBean.vScreenResizeX =
(int)((float)VirtualScreenBean.vScreenResizeX) * 1/2;
+ VirtualScreenBean.vScreenResizeY =
(int)((float)VirtualScreenBean.vScreenResizeY) * 1/2;
break;
case Low:
- VirtualScreenBean.vScreenResizeX *= 3/8;
- VirtualScreenBean.vScreenResizeY *= 3/8;
+ VirtualScreenBean.vScreenResizeX =
(int)((float)VirtualScreenBean.vScreenResizeX) * 3/8;
+ VirtualScreenBean.vScreenResizeY =
(int)((float)VirtualScreenBean.vScreenResizeY) * 3/8;
break;
}
logger.debug("resize: X:" + VirtualScreenBean.vScreenResizeX +
" Y: " + VirtualScreenBean.vScreenResizeY);
@@ -326,7 +316,7 @@ public class VirtualScreen {
void calcNewValueXSpin(){
if (this.doUpdateBounds){
- int newX =
Integer.valueOf(css.jVScreenXSpin.getValue().toString()).intValue();
+ int newX = css.jVScreenXSpin.getValue();
if(VirtualScreenBean.vScreenSpinnerWidth+newX >
VirtualScreenBean.screenWidthMax){
newX=VirtualScreenBean.screenWidthMax-VirtualScreenBean.vScreenSpinnerWidth;
css.jVScreenXSpin.setValue(newX);
@@ -336,7 +326,7 @@ public class VirtualScreen {
updateVScreenBounds();
}
} else {
- VirtualScreenBean.vScreenSpinnerX =
Integer.valueOf(css.jVScreenXSpin.getValue().toString()).intValue();
+ VirtualScreenBean.vScreenSpinnerX =
css.jVScreenXSpin.getValue();
}
calcRescaleFactors();
@@ -344,7 +334,7 @@ public class VirtualScreen {
void calcNewValueYSpin(){
if (this.doUpdateBounds){
- int newY =
Integer.valueOf(css.jVScreenYSpin.getValue().toString()).intValue();
+ int newY = css.jVScreenYSpin.getValue();
if(VirtualScreenBean.vScreenSpinnerHeight+newY >
VirtualScreenBean.screenHeightMax){
newY=VirtualScreenBean.screenHeightMax-VirtualScreenBean.vScreenSpinnerHeight;
css.jVScreenYSpin.setValue(newY);
@@ -354,7 +344,7 @@ public class VirtualScreen {
updateVScreenBounds();
}
} else {
- VirtualScreenBean.vScreenSpinnerY =
Integer.valueOf(css.jVScreenYSpin.getValue().toString()).intValue();
+ VirtualScreenBean.vScreenSpinnerY =
css.jVScreenYSpin.getValue();
}
calcRescaleFactors();
@@ -362,7 +352,7 @@ public class VirtualScreen {
void calcNewValueWidthSpin(){
if (this.doUpdateBounds){
- int newWidth =
Integer.valueOf(css.jVScreenWidthSpin.getValue().toString()).intValue();
+ int newWidth = css.jVScreenWidthSpin.getValue();
if(VirtualScreenBean.vScreenSpinnerX+newWidth >
VirtualScreenBean.screenWidthMax){
newWidth=VirtualScreenBean.screenWidthMax-VirtualScreenBean.vScreenSpinnerX;
css.jVScreenWidthSpin.setValue(newWidth);
@@ -372,7 +362,7 @@ public class VirtualScreen {
updateVScreenBounds();
}
} else {
- VirtualScreenBean.vScreenSpinnerWidth =
Integer.valueOf(css.jVScreenWidthSpin.getValue().toString()).intValue();
+ VirtualScreenBean.vScreenSpinnerWidth =
css.jVScreenWidthSpin.getValue();
}
calcRescaleFactors();
@@ -381,7 +371,7 @@ public class VirtualScreen {
void calcNewValueHeightSpin(){
if (this.doUpdateBounds){
- int newHeight =
Integer.valueOf(css.jVScreenHeightSpin.getValue().toString()).intValue();
+ int newHeight = css.jVScreenHeightSpin.getValue();
if(VirtualScreenBean.vScreenSpinnerY+newHeight >
VirtualScreenBean.screenHeightMax){
newHeight=VirtualScreenBean.screenHeightMax-VirtualScreenBean.vScreenSpinnerY;
css.jVScreenHeightSpin.setValue(newHeight);
@@ -391,7 +381,7 @@ public class VirtualScreen {
updateVScreenBounds();
}
} else {
- VirtualScreenBean.vScreenSpinnerHeight =
Integer.valueOf(css.jVScreenHeightSpin.getValue().toString()).intValue();
+ VirtualScreenBean.vScreenSpinnerHeight =
css.jVScreenHeightSpin.getValue();
}
calcRescaleFactors();
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenBean.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenBean.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenBean.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenBean.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart.gui;
+package org.openmeetings.screen.webstart.gui;
public class VirtualScreenBean {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenHeightMouseListener.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenHeightMouseListener.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenHeightMouseListener.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenHeightMouseListener.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart.gui;
+package org.openmeetings.screen.webstart.gui;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenMouseListener.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenMouseListener.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenMouseListener.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenMouseListener.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart.gui;
+package org.openmeetings.screen.webstart.gui;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenWidthMouseListener.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenWidthMouseListener.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenWidthMouseListener.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenWidthMouseListener.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart.gui;
+package org.openmeetings.screen.webstart.gui;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenXMouseListener.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenXMouseListener.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenXMouseListener.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenXMouseListener.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart.gui;
+package org.openmeetings.screen.webstart.gui;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenYMouseListener.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenYMouseListener.java?rev=1307373&r1=1307363&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenYMouseListener.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreenYMouseListener.java
Fri Mar 30 11:45:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.red5.screen.webstart.gui;
+package org.openmeetings.screen.webstart.gui;
import java.awt.Cursor;
import java.awt.event.MouseEvent;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java?rev=1307373&r1=1307372&r2=1307373&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Fri Mar 30 11:45:05 2012
@@ -314,10 +314,9 @@ public class ScreenRequestHandler extend
new Exception("No
connectionType ");
}
- String startUpClass =
"org.red5.screen.webstart.ScreenShare";
- if (connectionType.equals("rtmpt")) {
- startUpClass =
"org.red5.screen.webstart.ScreenShareRTMPT";
- }
+ String startUpClass =
connectionType.equals("rtmpt")
+ ?
"org.openmeetings.screen.webstart.ScreenShareRTMPT"
+ :
"org.openmeetings.screen.webstart.ScreenShare";
String orgIdAsString =
httpServletRequest
.getParameter("organization_id");
