Author: solomax
Date: Mon Sep 1 09:08:56 2014
New Revision: 1621711
URL: http://svn.apache.org/r1621711
Log:
Code clean-up
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
Mon Sep 1 09:08:56 2014
@@ -39,7 +39,7 @@ import org.springframework.beans.factory
public class FlvInterviewConverter extends BaseConverter {
private static final Logger log =
Red5LoggerFactory.getLogger(FlvInterviewConverter.class, webAppRootKey);
- private class ReConverterParams {
+ private static class ReConverterParams {
private int leftSideLoud = 1;
private int rightSideLoud = 1;
private Integer leftSideTime = 0;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
Mon Sep 1 09:08:56 2014
@@ -199,7 +199,7 @@ public class AppointmentLogic {
return;
}
- long milliseconds = (minutesReminderSend * 60 * 1000);
+ long milliseconds = (minutesReminderSend * 60 * 1000L);
Calendar start = Calendar.getInstance();
if (milliseconds < 0) {
start.setTimeInMillis(start.getTimeInMillis() +
milliseconds);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
Mon Sep 1 09:08:56 2014
@@ -68,13 +68,13 @@ public class WhiteboardMapToSVG extends
List pointsList = (List) graphObject.get(1);
- Integer lineWidth =
Integer.valueOf(graphObject.get(3).toString()).intValue();
- Integer col =
Integer.valueOf(graphObject.get(4).toString()).intValue();
+ Integer lineWidth =
Integer.valueOf(graphObject.get(3).toString());
+ Integer col =
Integer.valueOf(graphObject.get(4).toString());
- Float alpha =
Float.valueOf(graphObject.get(5).toString()).floatValue();
+ Float alpha =
Float.valueOf(graphObject.get(5).toString());
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
//log.debug("x,y,width,height:
"+x+","+y+","+width+","+height);
@@ -95,60 +95,60 @@ public class WhiteboardMapToSVG extends
actionObject[5] = fillDis;
actionObject[6] = this.currentrectangleOpacity;*/
- Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString()).intValue();
+ Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString());
- Integer stroke =
Integer.valueOf(graphObject.get(1).toString()).intValue();
- Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString()).intValue();
+ Integer stroke =
Integer.valueOf(graphObject.get(1).toString());
+ Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString());
Color strokeColor = null;
if (strokeDis != -1) {
strokeColor = new Color(stroke);
}
- Integer fill =
Integer.valueOf(graphObject.get(3).toString()).intValue();
- Integer fillDis=
Integer.valueOf(graphObject.get(5).toString()).intValue();
+ Integer fill =
Integer.valueOf(graphObject.get(3).toString());
+ Integer fillDis=
Integer.valueOf(graphObject.get(5).toString());
Color fillColor = null;
if (fillDis != -1) {
fillColor = new Color(fill);
}
- Float alpha =
Float.valueOf(graphObject.get(6).toString()).floatValue();
+ Float alpha =
Float.valueOf(graphObject.get(6).toString());
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
- Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue();
- Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
+ Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString());
+ Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString());
SVGGraphics2D svgGenerator_temp = new
SVGGraphics2D(svgGenerator);
this.paintRect2D(svgGenerator_temp, x, y, width,
height, strokeColor, lineWidth, fillColor, alpha);
} else if (graphType.equals("ellipse")) {
- Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString()).intValue();
+ Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString());
- Integer stroke =
Integer.valueOf(graphObject.get(1).toString()).intValue();
- Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString()).intValue();
+ Integer stroke =
Integer.valueOf(graphObject.get(1).toString());
+ Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString());
Color strokeColor = null;
if (strokeDis != -1) {
strokeColor = new Color(stroke);
}
- Integer fill =
Integer.valueOf(graphObject.get(3).toString()).intValue();
- Integer fillDis=
Integer.valueOf(graphObject.get(5).toString()).intValue();
+ Integer fill =
Integer.valueOf(graphObject.get(3).toString());
+ Integer fillDis=
Integer.valueOf(graphObject.get(5).toString());
Color fillColor = null;
if (fillDis != -1) {
fillColor = new Color(fill);
}
- Float alpha =
Float.valueOf(graphObject.get(6).toString()).floatValue();
+ Float alpha =
Float.valueOf(graphObject.get(6).toString());
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
- Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue();
- Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
+ Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString());
+ Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString());
SVGGraphics2D svgGenerator_temp = new
SVGGraphics2D(svgGenerator);
this.paintEllipse2D(svgGenerator_temp, x, y, width,
height, strokeColor, lineWidth, fillColor, alpha);
@@ -156,8 +156,8 @@ public class WhiteboardMapToSVG extends
} else if (graphType.equals("letter")) {
String text = graphObject.get(1).toString();
- Color fontColor = new Color
(Integer.valueOf(graphObject.get(2).toString()).intValue());
- Integer fontSize =
Integer.valueOf(graphObject.get(3).toString()).intValue();
+ Color fontColor = new Color
(Integer.valueOf(graphObject.get(2).toString()));
+ Integer fontSize =
Integer.valueOf(graphObject.get(3).toString());
String fontStyle = graphObject.get(4).toString();
Integer style = null;
@@ -173,46 +173,46 @@ public class WhiteboardMapToSVG extends
log.debug("fontStyle,style "+style+" fs: "+fontStyle);
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
- Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue();
- Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
+ Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString());
+ Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString());
SVGGraphics2D svgGenerator_temp = new
SVGGraphics2D(svgGenerator);
- this.paintTextByWidthHeight(svgGenerator_temp, (int)
Math.round(x), (int) Math.round(y), (int) Math.round(width),
+ paintTextByWidthHeight(svgGenerator_temp, (int)
Math.round(x), (int) Math.round(y), (int) Math.round(width),
(int) Math.round(height), text,
style, fontSize, fontColor);
} else if (graphType.equals("drawarrow")) {
- Integer thickness =
Integer.valueOf(graphObject.get(2).toString()).intValue();
+ Integer thickness =
Integer.valueOf(graphObject.get(2).toString());
- Integer stroke =
Integer.valueOf(graphObject.get(1).toString()).intValue();
- Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString()).intValue();
+ Integer stroke =
Integer.valueOf(graphObject.get(1).toString());
+ Integer strokeDis=
Integer.valueOf(graphObject.get(4).toString());
Color strokeColor = null;
if (strokeDis != -1) {
strokeColor = new Color(stroke);
}
- Integer fill =
Integer.valueOf(graphObject.get(3).toString()).intValue();
- Integer fillDis=
Integer.valueOf(graphObject.get(5).toString()).intValue();
+ Integer fill =
Integer.valueOf(graphObject.get(3).toString());
+ Integer fillDis=
Integer.valueOf(graphObject.get(5).toString());
Color fillColor = null;
if (fillDis != -1) {
fillColor = new Color(fill);
}
- Float alpha =
Float.valueOf(graphObject.get(6).toString()).floatValue();
+ Float alpha =
Float.valueOf(graphObject.get(6).toString());
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
//Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue();
//Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue();
- Double x1 =
Double.valueOf(graphObject.get(7).toString()).doubleValue();
- Double y1 =
Double.valueOf(graphObject.get(8).toString()).doubleValue();
- Double x2 =
Double.valueOf(graphObject.get(9).toString()).doubleValue();
- Double y2 =
Double.valueOf(graphObject.get(10).toString()).doubleValue();
+ Double x1 =
Double.valueOf(graphObject.get(7).toString());
+ Double y1 =
Double.valueOf(graphObject.get(8).toString());
+ Double x2 =
Double.valueOf(graphObject.get(9).toString());
+ Double y2 =
Double.valueOf(graphObject.get(10).toString());
GeomPoint start = new GeomPoint();
start.setLocation(x+x1,y+y1);
@@ -244,10 +244,10 @@ public class WhiteboardMapToSVG extends
Image myImage = ImageIO.read(myFile);
- int x = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue());
- int y = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue());
- int width = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue());
- int height = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue());
+ int x = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-5).toString()));
+ int y = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-4).toString()));
+ int width = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-3).toString()));
+ int height = (int)
Math.round(Double.valueOf(graphObject.get(graphObject.size()-2).toString()));
SVGGraphics2D svgGenerator_temp = new
SVGGraphics2D(svgGenerator);
svgGenerator_temp.drawImage(myImage, x, y,
width, height, null);
@@ -273,22 +273,22 @@ public class WhiteboardMapToSVG extends
// actionObject[12] = height;
// actionObject[13] = newName;
- Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString()).intValue();
+ Integer lineWidth =
Integer.valueOf(graphObject.get(2).toString());
- Integer stroke =
Integer.valueOf(graphObject.get(1).toString()).intValue();
+ Integer stroke =
Integer.valueOf(graphObject.get(1).toString());
Color strokeColor = new Color(stroke);
- Float alpha =
Float.valueOf(graphObject.get(3).toString()).floatValue();
+ Float alpha =
Float.valueOf(graphObject.get(3).toString());
- Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString()).doubleValue();
- Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString()).doubleValue();
+ Double x =
Double.valueOf(graphObject.get(graphObject.size()-5).toString());
+ Double y =
Double.valueOf(graphObject.get(graphObject.size()-4).toString());
//Double width =
Double.valueOf(graphObject.get(graphObject.size()-3).toString()).doubleValue();
//Double height =
Double.valueOf(graphObject.get(graphObject.size()-2).toString()).doubleValue();
- Double x1 =
Double.valueOf(graphObject.get(4).toString()).doubleValue();
- Double y1 =
Double.valueOf(graphObject.get(5).toString()).doubleValue();
- Double x2 =
Double.valueOf(graphObject.get(6).toString()).doubleValue();
- Double y2 =
Double.valueOf(graphObject.get(7).toString()).doubleValue();
+ Double x1 =
Double.valueOf(graphObject.get(4).toString());
+ Double y1 =
Double.valueOf(graphObject.get(5).toString());
+ Double x2 =
Double.valueOf(graphObject.get(6).toString());
+ Double y2 =
Double.valueOf(graphObject.get(7).toString());
SVGGraphics2D svgGenerator_temp = new
SVGGraphics2D(svgGenerator);
this.drawLine(svgGenerator_temp, x1, y1, x2, y2,
strokeColor, lineWidth, x, y, alpha);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java
Mon Sep 1 09:08:56 2014
@@ -21,6 +21,7 @@ package org.apache.openmeetings.core.dat
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.util.LinkedList;
import org.apache.openmeetings.util.OmFileHelper;
@@ -47,22 +48,24 @@ public class EmoticonsManager {
private LinkedList<LinkedList<String>> emotfilesList = new
LinkedList<LinkedList<String>>();
@SuppressWarnings("unchecked")
- public void loadEmot(){
+ public void loadEmot() {
+ BufferedReader reader = null;
try {
XStream xStream = new XStream(new XppDriver());
xStream.setMode(XStream.NO_REFERENCES);
- BufferedReader reader = new BufferedReader(new
FileReader(new File(OmFileHelper.getPublicEmotionsDir(), "emotes.xml")));
- String xmlString = "";
- while (reader.ready()) {
- xmlString += reader.readLine();
- }
- reader.close();
- emotfilesList =
ChatString.replaceAllRegExp((LinkedList<LinkedList<String>>)
xStream.fromXML(xmlString));
+ reader = new BufferedReader(new FileReader(new
File(OmFileHelper.getPublicEmotionsDir(), "emotes.xml")));
+ emotfilesList =
ChatString.replaceAllRegExp((LinkedList<LinkedList<String>>)
xStream.fromXML(reader));
log.debug("##### loadEmot completed");
} catch (Exception err) {
log.error("[loadEmot]",err);
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException e) {}
+ }
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
Mon Sep 1 09:08:56 2014
@@ -24,22 +24,19 @@ import java.util.List;
import java.util.Map;
import org.apache.openmeetings.db.dto.room.WhiteboardObject;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class WhiteboardManager {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- WhiteboardManager.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(WhiteboardManager.class, webAppRootKey);
@Autowired
- private WhiteBoardObjectListManagerById whiteBoardObjectListManagerById;
+ private WhiteBoardObjectListManagerById wbListManagerById;
@SuppressWarnings({ "rawtypes", "unchecked" })
- public void addWhiteBoardObjectById(Long room_id, Map whiteboardObj,
- Long whiteBoardId) {
+ public void addWhiteBoardObjectById(Long room_id, Map whiteboardObj,
Long whiteBoardId) {
try {
log.debug("addWhiteBoardObjectById: ", whiteboardObj);
@@ -59,20 +56,18 @@ public class WhiteboardManager {
List actionObject = (List) whiteboardObj.get(3);
if (action.equals("moveMap")) {
- WhiteboardObject whiteboardObject =
whiteBoardObjectListManagerById
+ WhiteboardObject whiteboardObject =
wbListManagerById
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
whiteBoardId);
- whiteboardObject.setX(Integer.valueOf(
-
actionObject.get(1).toString()).intValue());
- whiteboardObject.setY(Integer.valueOf(
-
actionObject.get(2).toString()).intValue());
+
whiteboardObject.setX(Integer.valueOf(actionObject.get(1).toString()));
+
whiteboardObject.setY(Integer.valueOf(actionObject.get(2).toString()));
- whiteBoardObjectListManagerById
+ wbListManagerById
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
whiteboardObject, whiteBoardId);
} else if (action.equals("draw") ||
action.equals("redo")) {
- WhiteboardObject whiteboardObject =
whiteBoardObjectListManagerById
+ WhiteboardObject whiteboardObject =
wbListManagerById
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
whiteBoardId);
@@ -86,20 +81,20 @@ public class WhiteboardManager {
log.debug("objectOID: " + objectOID);
whiteboardObject.getRoomItems()
.put(objectOID,
actionObject);
- whiteBoardObjectListManagerById
+ wbListManagerById
.setWhiteBoardObjectListRoomObjAndWhiteboardId(
room_id, whiteboardObject, whiteBoardId);
}
} else if (action.equals("clear")) {
- WhiteboardObject whiteboardObject =
whiteBoardObjectListManagerById
+ WhiteboardObject whiteboardObject =
wbListManagerById
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
whiteBoardId);
whiteboardObject.setRoomItems(new
HashMap<String, List>());
- whiteBoardObjectListManagerById
+ wbListManagerById
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
whiteboardObject, whiteBoardId);
} else if (action.equals("delete") ||
action.equals("undo")) {
- WhiteboardObject whiteboardObject =
whiteBoardObjectListManagerById
+ WhiteboardObject whiteboardObject =
wbListManagerById
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
whiteBoardId);
String objectOID =
actionObject.get(actionObject.size() - 1)
@@ -132,9 +127,7 @@ public class WhiteboardManager {
||
objectType.equals("mindmapnode")
|| objectType.equals("flv")) {
- Integer zIndex = Integer.valueOf(
-
actionObject.get(actionObject.size() - 8)
-
.toString()).intValue();
+ Integer zIndex =
Integer.valueOf(actionObject.get(actionObject.size() - 8).toString());
log.debug("1|zIndex " + zIndex);
log.debug("2|zIndex "
@@ -179,7 +172,7 @@ public class WhiteboardManager {
whiteboardObject.getRoomItems().remove(objectOID);
- whiteBoardObjectListManagerById
+ wbListManagerById
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
whiteboardObject, whiteBoardId);
} else if (action.equals("size") ||
action.equals("editProp")
@@ -188,7 +181,7 @@ public class WhiteboardManager {
|| action.equals("flv")
|| action.equals("editTextMindMapColor")
||
action.equals("editTextMindMapFontColor")) {
- WhiteboardObject whiteboardObject =
whiteBoardObjectListManagerById
+ WhiteboardObject whiteboardObject =
wbListManagerById
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
whiteBoardId);
String objectOID =
actionObject.get(actionObject.size() - 1)
@@ -213,8 +206,7 @@ public class WhiteboardManager {
String baseObjectName =
actionObject.get(
actionObject.size() - 1).toString();
- Integer slidesNumber =
Integer.valueOf(
-
actionObject.get(8).toString()).intValue();
+ Integer slidesNumber =
Integer.valueOf(actionObject.get(8).toString());
log.debug("updateObjectsToSlideNumber :: "
+
baseObjectName + "," + slidesNumber);
@@ -243,40 +235,14 @@ public class WhiteboardManager {
|| actionObjectStored.get(0).equals(
"letter")) {
- Map
swfObj = (Map) actionObjectStored
-
.get(actionObjectStored.size() - 7);
+ Map
swfObj = (Map) actionObjectStored.get(actionObjectStored.size() - 7);
log.debug("swfObj :1: " + swfObj);
if
(swfObj != null) {
-
-
if (swfObj.get("name").equals(
-
baseObjectName)) {
-
-
if (Integer.valueOf(
-
swfObj.get("slide")
-
.toString())
-
.intValue() == slidesNumber) {
-
-
swfObj.put("isVisible", true);
-
-
actionObjectStored.set(
-
actionObjectStored
-
.size() - 7,
-
swfObj);
-
-
} else {
-
-
swfObj.put("isVisible", false);
-
-
actionObjectStored.set(
-
actionObjectStored
-
.size() - 7,
-
swfObj);
-
-
}
-
+
if (swfObj.get("name").equals(baseObjectName)) {
+
swfObj.put("isVisible",
Integer.valueOf(swfObj.get("slide").toString()).intValue() == slidesNumber);
+
actionObjectStored.set(actionObjectStored.size() - 7, swfObj);
}
-
}
log.debug("swfObj :1: " + swfObj);
@@ -290,12 +256,12 @@ public class WhiteboardManager {
}
}
- whiteBoardObjectListManagerById
+ wbListManagerById
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
whiteboardObject, whiteBoardId);
} else if (action.equals("clearSlide")) {
- WhiteboardObject whiteboardObject =
whiteBoardObjectListManagerById
+ WhiteboardObject whiteboardObject =
wbListManagerById
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
whiteBoardId);
@@ -307,18 +273,18 @@ public class WhiteboardManager {
}
- whiteBoardObjectListManagerById
+ wbListManagerById
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
whiteboardObject, whiteBoardId);
} else if (action.equals("whiteboardObj")) {
- WhiteboardObject whiteboardObject =
whiteBoardObjectListManagerById
+ WhiteboardObject whiteboardObject =
wbListManagerById
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
whiteBoardId);
whiteboardObject.setFullFit((Boolean)
actionObject.get(1));
whiteboardObject.setZoom((Integer)
actionObject.get(2));
- whiteBoardObjectListManagerById
+ wbListManagerById
.setWhiteBoardObjectListRoomObjAndWhiteboardId(room_id,
whiteboardObject, whiteBoardId);
} else {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
Mon Sep 1 09:08:56 2014
@@ -21,6 +21,7 @@ package org.apache.openmeetings.core.doc
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import java.io.IOException;
import java.util.ArrayList;
import org.apache.openmeetings.util.Logger;
@@ -48,6 +49,7 @@ public class LibraryChartLoader {
@SuppressWarnings("rawtypes")
public ArrayList loadChart(File dir, String fileName) {
+ BufferedReader reader = null;
try {
File file = new File(dir, fileName + fileExt);
@@ -56,22 +58,21 @@ public class LibraryChartLoader {
XStream xStream = new XStream(new XppDriver());
xStream.setMode(XStream.NO_REFERENCES);
- BufferedReader reader = new BufferedReader(new FileReader(file));
- String xmlString = "";
- while (reader.ready()) {
- xmlString += reader.readLine();
- }
- reader.close();
- // lMap = (LinkedHashMap) xStream.fromXML(xmlString);
- ArrayList lMapList = (ArrayList) xStream.fromXML(xmlString);
+ reader = new BufferedReader(new FileReader(file));
+ ArrayList lMapList = (ArrayList) xStream.fromXML(reader);
return lMapList;
} catch (Exception err) {
log.error(err);
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException e) {}
+ }
}
return null;
-
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Mon Sep 1 09:08:56 2014
@@ -119,7 +119,7 @@ public class MainService implements IPen
Long users_id = sessiondataDao.checkSession(SID);
Set<Right> rights = userDao.getRights(users_id);
if (AuthLevelUtil.hasAdminLevel(rights) ||
AuthLevelUtil.hasWebServiceLevel(rights)) {
- users = userDao.get(new Long(USER_ID));
+ users = userDao.get(USER_ID);
} else {
users.setFirstname("No rights to do this");
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java
Mon Sep 1 09:08:56 2014
@@ -45,7 +45,7 @@ public abstract class AbstractUploadCont
@Autowired
protected ConfigurationDao configurationDao;
- protected class UploadInfo {
+ protected static class UploadInfo {
MultipartFile file;
Long userId;
String sid;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
Mon Sep 1 09:08:56 2014
@@ -143,8 +143,8 @@ public class RoomDao implements IDataPro
.getResultList();
}
- public Long getRoomsCapacityByIds(List<Long> ids) {
- return ids == null || ids.isEmpty() ? 0
+ public long getRoomsCapacityByIds(List<Long> ids) {
+ return ids == null || ids.isEmpty() ? 0L
: em.createNamedQuery("getRoomsCapacityByIds",
Long.class).setParameter("ids", ids).getSingleResult();
}
@@ -153,10 +153,10 @@ public class RoomDao implements IDataPro
}
private String getSipNumber(long roomId) {
- if (isSipEnabled()) {
- return cfgDao.getConfValue("red5sip.room_prefix", String.class,
"400") + roomId;
- }
- return null;
+ if (isSipEnabled()) {
+ return cfgDao.getConfValue("red5sip.room_prefix",
String.class, "400") + roomId;
+ }
+ return null;
}
public Room update(Room entity, Long userId) {
@@ -168,7 +168,7 @@ public class RoomDao implements IDataPro
}
if (entity.isSipEnabled() && isSipEnabled()) {
String sipNumber = getSipNumber(entity.getId());
- if (!sipNumber.equals(entity.getConfno())) {
+ if (sipNumber != null &&
!sipNumber.equals(entity.getConfno())) {
entity.setConfno(sipNumber);
}
sipDao.update(sipNumber, entity.getPin());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
Mon Sep 1 09:08:56 2014
@@ -144,8 +144,8 @@ public class UserDao implements IDataPro
}
private void setAdditionalParams(TypedQuery<?> q, Map<String, Object>
params) {
- for (String key : params.keySet()) {
- q.setParameter(key, params.get(key));
+ for (Map.Entry<String, Object> me: params.entrySet()) {
+ q.setParameter(me.getKey(), me.getValue());
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
Mon Sep 1 09:08:56 2014
@@ -34,13 +34,15 @@ public class RoomSearchResult {
}
public RoomSearchResult(SearchResult<Room> copy) {
- this.objectName = copy.getObjectName();
- this.records = copy.getRecords();
- this.result = new ArrayList<RoomDTO>(copy.getResult().size());
- for (Room r : copy.getResult()) {
- result.add(new RoomDTO(r));
+ if (copy != null) {
+ this.objectName = copy.getObjectName();
+ this.records = copy.getRecords();
+ this.result = new
ArrayList<RoomDTO>(copy.getResult().size());
+ for (Room r : copy.getResult()) {
+ result.add(new RoomDTO(r));
+ }
+ this.errorId = copy.getErrorId();
}
- this.errorId = copy.getErrorId();
}
public String getObjectName() {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Mon Sep 1 09:08:56 2014
@@ -684,11 +684,13 @@ public class BackupImport {
}
private Node getNode(Node doc, String name) {
- NodeList nl = doc.getChildNodes();
- for (int i = 0; i < nl.getLength(); ++i) {
- Node node = nl.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE &&
name.equals(node.getNodeName())) {
- return node;
+ if (doc != null) {
+ NodeList nl = doc.getChildNodes();
+ for (int i = 0; i < nl.getLength(); ++i) {
+ Node node = nl.item(i);
+ if (node.getNodeType() == Node.ELEMENT_NODE &&
name.equals(node.getNodeName())) {
+ return node;
+ }
}
}
return null;
@@ -916,7 +918,6 @@ public class BackupImport {
DocumentBuilder dBuilder =
DocumentBuilderFactory.newInstance().newDocumentBuilder();
Document doc = dBuilder.parse(xml);
- NodeList nl = getNode(getNode(doc, "root"),
listNodeName).getChildNodes();
userEmailMap.clear();
//add existence email from database
List<User> users = usersDao.getAllUsers();
@@ -926,26 +927,30 @@ public class BackupImport {
}
userEmailMap.put(u.getAdresses().getEmail(), -1);
}
- // one of the old OM version created 2 nodes "deleted" this
code block handles this
- for (int i = 0; i < nl.getLength(); ++i) {
- Node user = nl.item(i);
- NodeList nl1 = user.getChildNodes();
- boolean deletedFound = false;
- for (int j = 0; j < nl1.getLength(); ++j) {
- Node node = nl1.item(j);
- if (node.getNodeType() == Node.ELEMENT_NODE &&
"deleted".equals(node.getNodeName())) {
- if (deletedFound) {
- user.removeChild(node);
- break;
+ Node nList = getNode(getNode(doc, "root"), listNodeName);
+ if (nList != null) {
+ NodeList nl = nList.getChildNodes();
+ // one of the old OM version created 2 nodes "deleted"
this code block handles this
+ for (int i = 0; i < nl.getLength(); ++i) {
+ Node user = nl.item(i);
+ NodeList nl1 = user.getChildNodes();
+ boolean deletedFound = false;
+ for (int j = 0; j < nl1.getLength(); ++j) {
+ Node node = nl1.item(j);
+ if (node.getNodeType() ==
Node.ELEMENT_NODE && "deleted".equals(node.getNodeName())) {
+ if (deletedFound) {
+ user.removeChild(node);
+ break;
+ }
+ deletedFound = true;
}
- deletedFound = true;
}
}
}
StringWriter sw = new StringWriter();
Transformer xformer =
TransformerFactory.newInstance().newTransformer();
- xformer.transform(new DOMSource(doc), new StreamResult(sw));
+ xformer.transform(new DOMSource(doc), new StreamResult(sw));
List<User> list = new ArrayList<User>();
InputNode root = NodeBuilder.read(new
StringReader(sw.toString()));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
Mon Sep 1 09:08:56 2014
@@ -559,8 +559,8 @@ public class Admin {
if (cfg.ical_timeZone == null) {
System.out.println("Please enter timezone, Possible
timezones are:");
- for (String tzIcal : tzMap.keySet()) {
- System.out.println(String.format("%1$-25s%2$s",
"\"" + tzIcal + "\"", tzMap.get(tzIcal)));
+ for (Map.Entry<String,String> me : tzMap.entrySet()) {
+ System.out.println(String.format("%1$-25s%2$s",
"\"" + me.getKey() + "\"", me.getValue()));
}
System.exit(1);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
Mon Sep 1 09:08:56 2014
@@ -26,6 +26,8 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
@@ -110,9 +112,9 @@ public class OmHelpFormatter extends Hel
map.get(g).add(o);
}
}
- for (String _key : map.keySet()) {
- final String key = _key;
- List<OmOption> options = map.get(key);
+ for (Map.Entry<String, List<OmOption>> me : map.entrySet()) {
+ final String key = me.getKey();
+ List<OmOption> options = me.getValue();
Collections.sort(options, new Comparator<OmOption>(){
public int compare(OmOption o1, OmOption o2) {
boolean o1opt = !o1.isOptional(key);
@@ -148,11 +150,11 @@ public class OmHelpFormatter extends Hel
char[] delimiter = new char[width - 2];
Arrays.fill(delimiter, '-');
- for (String key : optList.keySet()) {
- if (GENERAL_OPTION_GROUP.equals(key)) {
+ for (Entry<String, List<OmOption>> me : optList.entrySet()) {
+ if (GENERAL_OPTION_GROUP.equals(me.getKey())) {
sb.append("General
options:").append(getNewLine());
}
- for (OmOption option : optList.get(key)) {
+ for (OmOption option : me.getValue()) {
StringBuilder optBuf = new
StringBuilder(option.getHelpPrefix());
if (optBuf.length() < maxPrefixLength) {
@@ -163,7 +165,7 @@ public class OmHelpFormatter extends Hel
int nextLineTabStop = maxPrefixLength + descPad;
- if (option.isOptional(key)) {
+ if (option.isOptional(me.getKey())) {
optBuf.append(optional);
}
if (option.getDescription() != null) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
Mon Sep 1 09:08:56 2014
@@ -53,6 +53,7 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -561,9 +562,6 @@ public class ImportInitvalues {
public void loadInitUserAndOrganisation(InstallationConfig cfg) throws
Exception {
Long default_lang_id = Long.parseLong(cfg.defaultLangId);
- if (default_lang_id == null) {
- default_lang_id = 1L;
- }
// Add default group
Organisation org = new Organisation();
@@ -636,8 +634,7 @@ public class ImportInitvalues {
Iterator<Element> it = root.elementIterator("lang");
it.hasNext();) {
Element item = it.next();
String country = item.getText();
- Integer id =
Integer.valueOf(item.attribute("id").getValue())
- .intValue();
+ Integer id =
Integer.valueOf(item.attribute("id").getValue());
String rtl = item.attribute("rightToLeft").getValue();
String code = item.attribute("code").getValue();
@@ -687,10 +684,10 @@ public class ImportInitvalues {
public void loadLanguagesFile(String langName) throws Exception {
Map<Integer, Map<String, Object>> listlanguages =
getLanguageFiles();
log.debug("Number of languages found: " + listlanguages.size());
- for (int langId : listlanguages.keySet()) {
- Map<String, Object> langMap = listlanguages.get(langId);
+ for (Entry<Integer, Map<String, Object>> me :
listlanguages.entrySet()) {
+ Map<String, Object> langMap = me.getValue();
if (langName.equals(langMap.get("name"))) {
- loadLanguagesFile(listlanguages, new
Hashtable<Long, Fieldvalues>(3000), langId);
+ loadLanguagesFile(listlanguages, new
Hashtable<Long, Fieldvalues>(3000), me.getKey());
break;
}
}
@@ -707,15 +704,14 @@ public class ImportInitvalues {
log.debug("loadInitLanguages rtl from xml: " + rtl);
- Boolean langRtl = false;
-
- if (rtl != null && rtl.equals("true")) {
- langRtl = true;
- }
+ Boolean langRtl = Boolean.TRUE.equals(rtl);
long ticks = System.currentTimeMillis();
FieldLanguage lang = fieldLanguageDaoImpl.addLanguage(langId,
langName, langRtl, code);
-
+ if (lang == null) {
+ log.error("Failed to create language");
+ throw new Exception("Failed to create language");
+ }
SAXReader reader = new SAXReader();
Document document = reader.read(new File(
OmFileHelper.getLanguagesDir(), langName +
".xml"));
@@ -728,7 +724,7 @@ public class ImportInitvalues {
Element item = (Element) it.next();
// log.error(item.getName());
- Long id =
Long.valueOf(item.attributeValue("id")).longValue();
+ Long id = Long.valueOf(item.attributeValue("id"));
String name = item.attributeValue("name");
String value = "";
@@ -772,17 +768,6 @@ public class ImportInitvalues {
log.debug("Lang ADDED: " + lang + "; seconds passed: " +
(System.currentTimeMillis() - ticks) / 1000);
}
- public static void main(String... args) {
- int pr = 22;
- int progressDelta = 50 - pr;
-
- double deltaProgressPerLanguageFile = new
Double(progressDelta)/new Double(34);
-
- pr += (2 * deltaProgressPerLanguageFile);
-
- System.err.println("deltaProgressPerLanguageFile:
"+deltaProgressPerLanguageFile +" "+ pr);
- }
-
public void loadLanguagesFiles() throws Exception {
Map<Integer, Map<String, Object>> listlanguages =
getLanguageFiles();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
Mon Sep 1 09:08:56 2014
@@ -137,7 +137,7 @@ public class ScreenSharerFrame extends J
}
}
- private class KeyValue<T> {
+ private static class KeyValue<T> {
private String key;
private T value;
@@ -172,7 +172,7 @@ public class ScreenSharerFrame extends J
}
//this implementation will not allow to Enable Panel in runtime
- private class DisabledPanel extends JPanel {
+ private static class DisabledPanel extends JPanel {
private static final long serialVersionUID = 1L;
@Override
@@ -184,7 +184,7 @@ public class ScreenSharerFrame extends J
}
}
- private class VerticalSlider extends MouseListenerable {
+ private static class VerticalSlider extends MouseListenerable {
private static final long serialVersionUID = 1L;
public VerticalSlider() {
@@ -200,7 +200,7 @@ public class ScreenSharerFrame extends J
}
}
- private class HorizontalSlider extends MouseListenerable {
+ private static class HorizontalSlider extends MouseListenerable {
private static final long serialVersionUID = 1L;
public HorizontalSlider() {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java
Mon Sep 1 09:08:56 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.util;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
@@ -31,12 +33,23 @@ import org.slf4j.Logger;
*
*/
public class CalendarPatterns {
+ private static final Logger log =
Red5LoggerFactory.getLogger(CalendarPatterns.class, webAppRootKey);
- private static final Logger log =
Red5LoggerFactory.getLogger(CalendarPatterns.class, "openmeetings");
-
- public static SimpleDateFormat dateFormat__ddMMyyyyHHmmss = new
SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
- public static SimpleDateFormat dateFormat__ddMMyyyy = new
SimpleDateFormat("dd.MM.yyyy");
- public static SimpleDateFormat dateFormat__ddMMyyyyBySeparator = new
SimpleDateFormat("dd-MM-yyyy");
+ public static ThreadLocal<SimpleDateFormat> dateFormat__ddMMyyyyHHmmss
= new ThreadLocal<SimpleDateFormat>() {
+ protected SimpleDateFormat initialValue() {
+ return new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+ };
+ };
+ public static ThreadLocal<SimpleDateFormat> dateFormat__ddMMyyyy = new
ThreadLocal<SimpleDateFormat>() {
+ protected SimpleDateFormat initialValue() {
+ return new SimpleDateFormat("dd.MM.yyyy");
+ };
+ };
+ public static ThreadLocal<SimpleDateFormat>
dateFormat__ddMMyyyyBySeparator = new ThreadLocal<SimpleDateFormat>() {
+ protected SimpleDateFormat initialValue() {
+ return new SimpleDateFormat("dd-MM-yyyy");
+ };
+ };
public static String getDateByMiliSeconds(Date t){
SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy");
@@ -96,13 +109,13 @@ public class CalendarPatterns {
Date resultDate = null;
- resultDate = validDate(dateFormat__ddMMyyyyHHmmss, dateString);
+ resultDate = validDate(dateFormat__ddMMyyyyHHmmss.get(),
dateString);
if ( resultDate != null ) {
return resultDate;
}
- resultDate = validDate(dateFormat__ddMMyyyy, dateString);
+ resultDate = validDate(dateFormat__ddMMyyyy.get(), dateString);
if ( resultDate != null ) {
return resultDate;
@@ -185,7 +198,7 @@ public class CalendarPatterns {
public static Date parseDate(String dateString) {
try {
- return dateFormat__ddMMyyyy.parse(dateString);
+ return dateFormat__ddMMyyyy.get().parse(dateString);
} catch (Exception e) {
log.error("parseDate",e);
}
@@ -194,7 +207,7 @@ public class CalendarPatterns {
public static Date parseDateBySeparator(String dateString) {
try {
- return dateFormat__ddMMyyyyBySeparator.parse(dateString);
+ return dateFormat__ddMMyyyyBySeparator.get().parse(dateString);
} catch (Exception e) {
log.error("parseDate",e);
}
@@ -206,7 +219,7 @@ public class CalendarPatterns {
if (dateString == null || dateString.length()==0 ||
dateString.equals("null") ) {
return null;
}
- return dateFormat__ddMMyyyyHHmmss.parse(dateString);
+ return dateFormat__ddMMyyyyHHmmss.get().parse(dateString);
} catch (Exception e) {
log.error("parseDate",e);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java
Mon Sep 1 09:08:56 2014
@@ -22,7 +22,6 @@ import static org.apache.openmeetings.ut
import static org.red5.logging.Red5LoggerFactory.getLogger;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -104,36 +103,24 @@ public class ConverterProcessResultList
* @return
*/
public FileImportError[] convertToFileImportErrors() {
- FileImportError[] fileImportErrors = new
FileImportError[jobslist
- .size()];
+ FileImportError[] errors = new FileImportError[jobslist.size()];
int i = 0;
// Axis need Objects or array of objects, Map won't work
- for (Iterator<String> iter = jobslist.keySet().iterator(); iter
- .hasNext();) {
+ for (Map.Entry<String, ConverterProcessResult> me :
jobslist.entrySet()) {
- ConverterProcessResult returnAttribute =
jobslist.get(iter
- .next());
+ ConverterProcessResult result = me.getValue();
- fileImportErrors[i] = new FileImportError();
- fileImportErrors[i]
-
.setCommand((returnAttribute.getCommand() != null) ? returnAttribute
-
.getCommand().toString() : "");
- fileImportErrors[i]
- .setError((returnAttribute.getError()
!= null) ? returnAttribute
- .getError().toString()
: "");
- fileImportErrors[i]
-
.setExitValue((returnAttribute.getExitValue() != null) ? Integer
-
.valueOf(returnAttribute.getExitValue().toString())
- .intValue() : 0);
- fileImportErrors[i]
-
.setProcess((returnAttribute.getProcess() != null) ? returnAttribute
-
.getProcess().toString() : "");
+ errors[i] = new FileImportError();
+ errors[i].setCommand((result.getCommand() != null) ?
result.getCommand().toString() : "");
+ errors[i].setError((result.getError() != null) ?
result.getError().toString() : "");
+ errors[i].setExitValue((result.getExitValue() != null)
? Integer.valueOf(result.getExitValue().toString()) : 0);
+ errors[i].setProcess((result.getProcess() != null) ?
result.getProcess().toString() : "");
i++;
}
- return fileImportErrors;
+ return errors;
}
public int size() {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
Mon Sep 1 09:08:56 2014
@@ -92,11 +92,11 @@ public class ProcessHelper {
}
private static String getCommand(String[] argv) {
- String tString = "";
+ StringBuffer tString = new StringBuffer();
for (int i = 0; i < argv.length; i++) {
- tString += argv[i] + " ";
+ tString.append(argv[i]).append(" ");
}
- return tString;
+ return tString.toString();
}
private static void debugCommand(String desc, String[] argv) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
Mon Sep 1 09:08:56 2014
@@ -195,8 +195,9 @@ public class ChatString {
public static String link(String input) {
try {
-
- String tReturn = "";
+ Pattern p = Pattern.compile(
+ "(^|[
\t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet|wais|file|prospero|aim|webcal):(([A-Za-z0-9$_.+!*(),;/?:@&~=-])|%[A-Fa-f0-9]{2}){2,}(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*(),;/?:@&~=%-]*))?([A-Za-z0-9$_+!*();/?:~-]))");
+ StringBuffer tReturn = new StringBuffer();
String parts[] = input.split(" ");
@@ -206,10 +207,7 @@ public class ChatString {
// System.out.println("Part 1 "+text);
- Matcher matcher = Pattern
- .compile(
- "(^|[
\t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet|wais|file|prospero|aim|webcal):(([A-Za-z0-9$_.+!*(),;/?:@&~=-])|%[A-Fa-f0-9]{2}){2,}(#([a-zA-Z0-9][a-zA-Z0-9$_.+!*(),;/?:@&~=%-]*))?([A-Za-z0-9$_+!*();/?:~-]))")
- .matcher(text);
+ Matcher matcher = p.matcher(text);
if (matcher.find()) {
text = matcher
@@ -221,14 +219,14 @@ public class ChatString {
// System.out.println("Part 2 "+text);
if (t != 0) {
- tReturn += " ";
+ tReturn.append(" ");
}
- tReturn += text;
+ tReturn.append(text);
}
- return tReturn;
+ return tReturn.toString();
} catch (Exception e) {
log.error("[link]", e);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
Mon Sep 1 09:08:56 2014
@@ -73,7 +73,7 @@ public class LdapsPanel extends AdminPan
}
});
item.add(AttributeModifier.replace("class",
"clickable ui-widget-content"
- + (lc.getId() ==
form.getModelObject().getId() ? " ui-state-active" : "")));
+ +
(lc.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : "")));
}
};
add(listContainer.add(dataView).setOutputMarkupId(true));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Mon Sep 1 09:08:56 2014
@@ -28,6 +28,7 @@ import static org.springframework.web.co
import java.util.HashSet;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
@@ -250,10 +251,10 @@ public class Application extends Authent
}
public static long getRoom(Client c) {
- for (long roomId : ROOMS.keySet()) {
- Set<Client> clients = ROOMS.get(roomId);
+ for (Entry<Long, Set<Client>> me : ROOMS.entrySet()) {
+ Set<Client> clients = me.getValue();
if (clients.contains(c)) {
- return roomId;
+ return me.getKey();
}
}
return -1;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
Mon Sep 1 09:08:56 2014
@@ -330,10 +330,10 @@ public class SignInPage extends BaseInit
// generate random password
byte[] rawPass = new byte[16];
Random rnd = new Random();
- for (int i = 0; i < 16; i++) {
- rawPass[i] = (byte) (97 + rnd.nextInt(25));
+ for (int i = 0; i < 25; i++) {
+ rawPass[i] = (byte) ('!' + rnd.nextInt(93));
}
- String pass = new String(rawPass);
+ String pass = new String(rawPass, "UTF-8");
// check if the user already exists and register new one if
it's needed
if (user == null) {
Integer defaultlangId =
Integer.valueOf(configurationDao.getConfValue("default_lang_id", String.class,
"1"));
@@ -354,7 +354,7 @@ public class SignInPage extends BaseInit
return;
}
user.setLastlogin(new Date());
- user = userDao.update(user, pass, -1);
+ userDao.update(user, pass, -1);
}
if (WebSession.get().signIn(login, pass, Type.oauth, serverId))
{
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
Mon Sep 1 09:08:56 2014
@@ -499,17 +499,17 @@ public class InstallWizard extends Wizar
List<SelectOption> list = new ArrayList<SelectOption>();
- for (Integer key : allLanguagesAll.keySet()) {
- String langName = (String)
allLanguagesAll.get(key).get("name");
- String langCode = (String)
allLanguagesAll.get(key).get("code");
- SelectOption op = new
SelectOption(key.toString(), langName);
+ for (Map.Entry<Integer,Map<String,Object>> me :
allLanguagesAll.entrySet()) {
+ String langName = (String)
me.getValue().get("name");
+ String langCode = (String)
me.getValue().get("code");
+ SelectOption op = new
SelectOption(me.getKey().toString(), langName);
if (langCode != null) {
if
(getSession().getLocale().toString().startsWith(langCode)) {
option = op;
}
list.add(op);
}
- if (option == null &&
key.toString().equals(cfg.defaultLangId)) {
+ if (option == null &&
me.getKey().toString().equals(cfg.defaultLangId)) {
option = op;
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Mon Sep 1 09:08:56 2014
@@ -34,6 +34,8 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -230,9 +232,11 @@ public class RoomPanel extends BasePanel
@Override
protected void onEvent(AjaxRequestTarget target) {
String app = "";
+ InputStream jnlp = null;
try {
ConfigurationDao cfgDao =
getBean(ConfigurationDao.class);
- app =
IOUtils.toString(getClass().getClassLoader().getResourceAsStream("APPLICATION.jnlp"),
"UTF-8");
+ jnlp =
getClass().getClassLoader().getResourceAsStream("APPLICATION.jnlp");
+ app = IOUtils.toString(jnlp, "UTF-8");
String baseUrl = cfgDao.getBaseUrl();
URL url = new URL(baseUrl);
String path = url.getPath();
@@ -263,6 +267,12 @@ public class RoomPanel extends BasePanel
;
} catch (Exception e) {
log.error("Unexpected error while
creating jnlp file", e);
+ } finally {
+ if (jnlp != null) {
+ try {
+ jnlp.close();
+ } catch (IOException e) {}
+ }
}
download.setResourceStream(new
StringResourceStream(app, "application/x-java-jnlp-file"));
download.initiate(target);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Mon Sep 1 09:08:56 2014
@@ -81,11 +81,14 @@ public class VideoInfo extends Panel {
update(null, r);
}
- public VideoInfo update(AjaxRequestTarget target, FlvRecording r) {
- rm.setObject(r == null ? new FlvRecording() : r);
+ public VideoInfo update(AjaxRequestTarget target, FlvRecording _r) {
+ FlvRecording r = _r == null ? new FlvRecording() : _r;
+ rm.setObject(r);
try {
Room room = getBean(RoomDao.class).get(r.getRoomId());
- roomName.setObject(room.getName());
+ if (room != null) {
+ roomName.setObject(room.getName());
+ }
} catch (Exception e) {
//no-op
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
Mon Sep 1 09:08:56 2014
@@ -48,7 +48,7 @@ public class UserDashboardPersister impl
new XStreamDashboardPersister().save(dashboard);
}
- public class XStreamDashboardPersister implements DashboardPersister {
+ public static class XStreamDashboardPersister implements
DashboardPersister {
private File file;
private XStream xstream;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1621711&r1=1621710&r2=1621711&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Mon Sep 1 09:08:56 2014
@@ -126,11 +126,8 @@ public class UserWebService {
return -1L;
}
- Boolean bool = sessiondataDao.updateUser(SID,
u.getId(), false, u.getLanguage_id());
- if (bool == null) {
- // Exception
- return -1L;
- } else if (!bool) {
+ boolean bool = sessiondataDao.updateUser(SID,
u.getId(), false, u.getLanguage_id());
+ if (!bool) {
// invalid Session-Object
return -35L;
}
