Author: solomax
Date: Mon Sep 1 13:24:30 2014
New Revision: 1621768
URL: http://svn.apache.org/r1621768
Log:
Code clean-up
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.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/CreateLibraryPresentation.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LanguageImport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.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/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
Mon Sep 1 13:24:30 2014
@@ -30,7 +30,7 @@ import org.apache.openmeetings.db.dao.fi
import org.apache.openmeetings.db.dao.record.FlvRecordingLogDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.file.FileItem.Type;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -39,8 +39,7 @@ import org.springframework.beans.factory
public class FlvExplorerConverter extends BaseConverter {
- private static final Logger log = Red5LoggerFactory.getLogger(
- FlvExplorerConverter.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(FlvExplorerConverter.class, webAppRootKey);
// Spring loaded Beans
@Autowired
@@ -132,7 +131,6 @@ public class FlvExplorerConverter extend
}
private FlvDimension getFlvDimension(String txt) throws Exception {
-
Pattern p = Pattern.compile("\\d{2,4}(x)\\d{2,4}");
Matcher matcher = p.matcher(txt);
@@ -143,7 +141,6 @@ public class FlvExplorerConverter extend
String[] resultions = foundResolution.split("x");
return new
FlvDimension(Integer.valueOf(resultions[0]).intValue(),
Integer.valueOf(resultions[1]).intValue());
-
}
return null;
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=1621768&r1=1621767&r2=1621768&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 13:24:30 2014
@@ -22,9 +22,12 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.openmeetings.db.dto.room.WhiteboardObject;
+
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -149,10 +152,7 @@ public class WhiteboardManager {
List actionObjectStored =
whiteboardObject
.getRoomItems().get(whiteboardObjKey);
- Integer zIndexStored =
Integer.valueOf(
-
actionObjectStored.get(
-
actionObjectStored.size() - 8)
-
.toString()).intValue();
+ Integer zIndexStored =
Integer.valueOf(actionObjectStored.get(actionObjectStored.size() -
8).toString());
log.debug("zIndexStored|zIndex
" + zIndexStored + "|"
+ zIndex);
@@ -161,11 +161,9 @@ public class WhiteboardManager {
zIndexStored -= 1;
log.debug("new-zIndex "
+ zIndexStored);
}
-
actionObjectStored.set(actionObjectStored.size() - 8,
- zIndexStored);
+
actionObjectStored.set(actionObjectStored.size() - 8, zIndexStored);
-
whiteboardObject.getRoomItems().put(whiteboardObjKey,
-
actionObjectStored);
+
whiteboardObject.getRoomItems().put(whiteboardObjKey, actionObjectStored);
}
}
@@ -184,17 +182,15 @@ public class WhiteboardManager {
WhiteboardObject whiteboardObject =
wbListManagerById
.getWhiteBoardObjectListByRoomIdAndWhiteboard(room_id,
whiteBoardId);
- String objectOID =
actionObject.get(actionObject.size() - 1)
- .toString();
+ String objectOID =
actionObject.get(actionObject.size() - 1).toString();
// List roomItem = roomList.get(objectOID);
- List currentObject =
whiteboardObject.getRoomItems().get(
- objectOID);
+ List currentObject =
whiteboardObject.getRoomItems().get(objectOID);
if (actionObject.get(0).equals("paint")) {
actionObject.set(1,
currentObject.get(1));
}
whiteboardObject.getRoomItems().put(objectOID,
actionObject);
- Map roomList = whiteboardObject.getRoomItems();
+ Map<String, List> roomList =
whiteboardObject.getRoomItems();
if (action.equals("swf")) {
@@ -204,36 +200,23 @@ public class WhiteboardManager {
if (actionObject.get(8) !=
currentObject.get(8)) {
- String baseObjectName =
actionObject.get(
-
actionObject.size() - 1).toString();
+ String baseObjectName =
actionObject.get(actionObject.size() - 1).toString();
Integer slidesNumber =
Integer.valueOf(actionObject.get(8).toString());
-
log.debug("updateObjectsToSlideNumber :: "
- +
baseObjectName + "," + slidesNumber);
+
log.debug("updateObjectsToSlideNumber :: " + baseObjectName + "," +
slidesNumber);
- for (Iterator<String>
iter = roomList.keySet()
-
.iterator(); iter.hasNext();) {
- String
whiteboardObjKey = iter.next();
- List
actionObjectStored = (List) roomList
-
.get(whiteboardObjKey);
+ for (Entry<String,
List> me : roomList.entrySet()) {
+ List
actionObjectStored = me.getValue();
if
(actionObjectStored.get(0).equals("ellipse")
-
|| actionObjectStored.get(0).equals(
-
"drawarrow")
-
|| actionObjectStored.get(0).equals(
-
"line")
-
|| actionObjectStored.get(0).equals(
-
"clipart")
-
|| actionObjectStored.get(0).equals(
-
"paint")
-
|| actionObjectStored.get(0).equals(
-
"rectangle")
-
|| actionObjectStored.get(0).equals(
-
"uline")
-
|| actionObjectStored.get(0).equals(
-
"image")
-
|| actionObjectStored.get(0).equals(
-
"letter")) {
+
|| actionObjectStored.get(0).equals("drawarrow")
+
|| actionObjectStored.get(0).equals("line")
+
|| actionObjectStored.get(0).equals("clipart")
+
|| actionObjectStored.get(0).equals("paint")
+
|| actionObjectStored.get(0).equals("rectangle")
+
|| actionObjectStored.get(0).equals("uline")
+
|| actionObjectStored.get(0).equals("image")
+
|| actionObjectStored.get(0).equals("letter")) {
Map
swfObj = (Map) actionObjectStored.get(actionObjectStored.size() - 7);
log.debug("swfObj :1: " + swfObj);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java
Mon Sep 1 13:24:30 2014
@@ -43,30 +43,29 @@ public class CreateLibraryPresentation {
ConverterProcessResult returnMap = new ConverterProcessResult();
returnMap.setProcess("generateXMLDocument");
try {
+ Document document = DocumentHelper.createDocument();
+ Element root = document.addElement("presentation");
- Document document = DocumentHelper.createDocument();
- Element root = document.addElement( "presentation" );
-
- File file = new File(targetDirectory, originalDocument);
- root.addElement( "originalDocument" )
+ File file = new File(targetDirectory, originalDocument);
+ root.addElement("originalDocument")
.addAttribute("lastmod", (new
Long(file.lastModified())).toString())
.addAttribute("size", (new
Long(file.length())).toString())
- .addText( originalDocument );
+ .addText(originalDocument);
if (pdfDocument!=null){
File pdfDocumentFile = new File(targetDirectory,
pdfDocument);
- root.addElement( "pdfDocument" )
+ root.addElement("pdfDocument")
.addAttribute("lastmod", (new
Long(pdfDocumentFile.lastModified())).toString())
.addAttribute("size", (new
Long(pdfDocumentFile.length())).toString())
- .addText( pdfDocument );
+ .addText(pdfDocument);
}
if (swfDocument!=null){
File swfDocumentFile = new File(targetDirectory,
originalDocument);
- root.addElement( "swfDocument" )
+ root.addElement("swfDocument")
.addAttribute("lastmod", (new
Long(swfDocumentFile.lastModified())).toString())
- .addAttribute("size", (new
Long(swfDocumentFile.length())).toString())
- .addText( swfDocument );
+ .addAttribute("size", (new
Long(swfDocumentFile.length())).toString())
+ .addText(swfDocument);
}
Element thumbs = root.addElement( "thumbs" );
@@ -88,20 +87,18 @@ public class CreateLibraryPresentation {
thumbs.addElement( "thumb" )
.addAttribute("lastmod", (new Long(thumbfile.lastModified())).toString())
.addAttribute("size",
(new Long(thumbfile.length())).toString())
- .addText( allfiles[i] );
+ .addText(allfiles[i]);
}
}
}
-
- // lets write to a file
- XMLWriter writer = new XMLWriter(
- new FileOutputStream(new File(targetDirectory,
OmFileHelper.libraryFileName))
- );
- writer.write( document );
- writer.close();
- returnMap.setExitValue("0");
-
+ // lets write to a file
+ XMLWriter writer = new XMLWriter(new
FileOutputStream(new File(targetDirectory, OmFileHelper.libraryFileName)));
+ writer.write(document);
+ writer.close();
+
+ returnMap.setExitValue("0");
+
return returnMap;
} catch (Exception err) {
log.error("Error while generateXMLDocument", err);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
Mon Sep 1 13:24:30 2014
@@ -67,13 +67,13 @@ public class LibraryDocumentConverter {
log.debug("Write to "+filePathComplete);
PrintWriter pw = new PrintWriter(new
FileWriter(filePathComplete));
- pw.println(xmlString);
- pw.flush();
- pw.close();
+ pw.println(xmlString);
+ pw.flush();
+ pw.close();
//return new Long(1);
- return filePathComplete.getCanonicalPath();
+ return filePathComplete.getCanonicalPath();
} catch (Exception err){
log.error("writeToLocalFolder",err);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java
Mon Sep 1 13:24:30 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 java.util.Iterator;
import java.util.LinkedHashMap;
@@ -42,6 +43,7 @@ public class LibraryWmlLoader {
@SuppressWarnings({ "rawtypes" })
public ArrayList loadWmlFile(String fileName){
+ BufferedReader reader = null;
try {
String name = fileName;
if (!name.endsWith(fileExt)) {
@@ -53,18 +55,18 @@ public class LibraryWmlLoader {
XStream xStream = new XStream(new XppDriver());
xStream.setMode(XStream.NO_REFERENCES);
- BufferedReader reader = new BufferedReader(new
FileReader(filepathComplete));
- 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(filepathComplete));
+ ArrayList lMapList = (ArrayList) xStream.fromXML(reader);
return lMapList;
} catch (Exception err){
log.error("loadWmlFile",err);
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException e) {}
+ }
}
return null;
@@ -88,10 +90,10 @@ public class LibraryWmlLoader {
Element pointElement = (Element) i.next();
LinkedHashMap<Integer,Object> singlePoint = new
LinkedHashMap<Integer,Object>();
singlePoint.put(0, pointElement.getName());
- singlePoint.put(1,
Integer.valueOf(pointElement.attribute("val1").getText()).intValue());
- singlePoint.put(2,
Integer.valueOf(pointElement.attribute("val2").getText()).intValue());
- singlePoint.put(3,
Integer.valueOf(pointElement.attribute("val3").getText()).intValue());
- singlePoint.put(4,
Integer.valueOf(pointElement.attribute("val4").getText()).intValue());
+ singlePoint.put(1,
Integer.valueOf(pointElement.attribute("val1").getText()));
+ singlePoint.put(2,
Integer.valueOf(pointElement.attribute("val2").getText()));
+ singlePoint.put(3,
Integer.valueOf(pointElement.attribute("val3").getText()));
+ singlePoint.put(4,
Integer.valueOf(pointElement.attribute("val4").getText()));
pointMap.put(k, singlePoint);
log.debug("createListObjectPaintByNode"+singlePoint);
k++;
@@ -99,13 +101,13 @@ public class LibraryWmlLoader {
subMap.put(1, pointMap);
subMap.put(2,
paintElement.element("fillstyle").getText());
- subMap.put(3,
Integer.valueOf(paintElement.element("linewidth").getText()).intValue());
- subMap.put(4,
Integer.valueOf(paintElement.element("strokestyle").getText()).intValue());
- subMap.put(5,
Integer.valueOf(paintElement.element("counter").getText()).intValue());
- subMap.put(6,
Float.valueOf(paintElement.element("x").getText()).floatValue());
- subMap.put(7,
Float.valueOf(paintElement.element("y").getText()).floatValue());
- subMap.put(8,
Float.valueOf(paintElement.element("width").getText()).floatValue());
- subMap.put(9,
Float.valueOf(paintElement.element("height").getText()).floatValue());
+ subMap.put(3,
Integer.valueOf(paintElement.element("linewidth").getText()));
+ subMap.put(4,
Integer.valueOf(paintElement.element("strokestyle").getText()));
+ subMap.put(5,
Integer.valueOf(paintElement.element("counter").getText()));
+ subMap.put(6,
Float.valueOf(paintElement.element("x").getText()));
+ subMap.put(7,
Float.valueOf(paintElement.element("y").getText()));
+ subMap.put(8,
Float.valueOf(paintElement.element("width").getText()));
+ subMap.put(9,
Float.valueOf(paintElement.element("height").getText()));
subMap.put(10,
paintElement.element("layername").getText());
} catch (Exception err) {
@@ -122,14 +124,14 @@ public class LibraryWmlLoader {
try {
subMap.put(1,
paintElement.element("textforfield").getText());
- subMap.put(2,
Integer.valueOf(paintElement.element("fgcolor").getText()).intValue());
- subMap.put(3,
Integer.valueOf(paintElement.element("fontsize").getText()).intValue());
+ subMap.put(2,
Integer.valueOf(paintElement.element("fgcolor").getText()));
+ subMap.put(3,
Integer.valueOf(paintElement.element("fontsize").getText()));
subMap.put(4,
paintElement.element("fontstyle").getText());
- subMap.put(5,
Integer.valueOf(paintElement.element("counter").getText()).intValue());
- subMap.put(6,
Float.valueOf(paintElement.element("x").getText()).floatValue());
- subMap.put(7,
Float.valueOf(paintElement.element("y").getText()).floatValue());
- subMap.put(8,
Float.valueOf(paintElement.element("width").getText()).floatValue());
- subMap.put(9,
Float.valueOf(paintElement.element("height").getText()).floatValue());
+ subMap.put(5,
Integer.valueOf(paintElement.element("counter").getText()));
+ subMap.put(6,
Float.valueOf(paintElement.element("x").getText()));
+ subMap.put(7,
Float.valueOf(paintElement.element("y").getText()));
+ subMap.put(8,
Float.valueOf(paintElement.element("width").getText()));
+ subMap.put(9,
Float.valueOf(paintElement.element("height").getText()));
subMap.put(10,
paintElement.element("layername").getText());
} catch (Exception err) {
@@ -152,11 +154,11 @@ public class LibraryWmlLoader {
subMap.put(5,
paintElement.element("parentpath").getText());
subMap.put(6, paintElement.element("room").getText());
subMap.put(7, paintElement.element("domain").getText());
- subMap.put(8,
Integer.valueOf(paintElement.element("counter").getText()).intValue());
- subMap.put(9,
Float.valueOf(paintElement.element("x").getText()).floatValue());
- subMap.put(10,
Float.valueOf(paintElement.element("y").getText()).floatValue());
- subMap.put(11,
Float.valueOf(paintElement.element("width").getText()).floatValue());
- subMap.put(12,
Float.valueOf(paintElement.element("height").getText()).floatValue());
+ subMap.put(8,
Integer.valueOf(paintElement.element("counter").getText()));
+ subMap.put(9,
Float.valueOf(paintElement.element("x").getText()));
+ subMap.put(10,
Float.valueOf(paintElement.element("y").getText()));
+ subMap.put(11,
Float.valueOf(paintElement.element("width").getText()));
+ subMap.put(12,
Float.valueOf(paintElement.element("height").getText()));
subMap.put(13,
paintElement.element("layername").getText());
} catch (Exception err) {
@@ -174,16 +176,16 @@ public class LibraryWmlLoader {
subMap.put(1,
paintElement.element("fillstyle").getText());
subMap.put(2,
paintElement.element("linewidth").getText());
- subMap.put(3,
Integer.valueOf(paintElement.element("strokestyle").getText()).intValue());
- subMap.put(4,
Float.valueOf(paintElement.element("startx").getText()).floatValue());
- subMap.put(5,
Float.valueOf(paintElement.element("starty").getText()).floatValue());
- subMap.put(6,
Float.valueOf(paintElement.element("endx").getText()).floatValue());
- subMap.put(7,
Float.valueOf(paintElement.element("endy").getText()).floatValue());
- subMap.put(8,
Integer.valueOf(paintElement.element("counter").getText()).intValue());
- subMap.put(9,
Float.valueOf(paintElement.element("x").getText()).floatValue());
- subMap.put(10,
Float.valueOf(paintElement.element("y").getText()).floatValue());
- subMap.put(11,
Float.valueOf(paintElement.element("width").getText()).floatValue());
- subMap.put(12,
Float.valueOf(paintElement.element("height").getText()).floatValue());
+ subMap.put(3,
Integer.valueOf(paintElement.element("strokestyle").getText()));
+ subMap.put(4,
Float.valueOf(paintElement.element("startx").getText()));
+ subMap.put(5,
Float.valueOf(paintElement.element("starty").getText()));
+ subMap.put(6,
Float.valueOf(paintElement.element("endx").getText()));
+ subMap.put(7,
Float.valueOf(paintElement.element("endy").getText()));
+ subMap.put(8,
Integer.valueOf(paintElement.element("counter").getText()));
+ subMap.put(9,
Float.valueOf(paintElement.element("x").getText()));
+ subMap.put(10,
Float.valueOf(paintElement.element("y").getText()));
+ subMap.put(11,
Float.valueOf(paintElement.element("width").getText()));
+ subMap.put(12,
Float.valueOf(paintElement.element("height").getText()));
subMap.put(13,
paintElement.element("layername").getText());
} catch (Exception err) {
@@ -199,13 +201,13 @@ public class LibraryWmlLoader {
public void createListObjectRectAndEllipseByNode(Element paintElement,
LinkedHashMap<Integer,Object> subMap){
try {
- subMap.put(1,
Integer.valueOf(paintElement.element("stroke").getText()).intValue());
+ subMap.put(1,
Integer.valueOf(paintElement.element("stroke").getText()));
subMap.put(2, paintElement.element("line").getText());
- subMap.put(3,
Integer.valueOf(paintElement.element("counter").getText()).intValue());
- subMap.put(4,
Float.valueOf(paintElement.element("x").getText()).floatValue());
- subMap.put(5,
Float.valueOf(paintElement.element("y").getText()).floatValue());
- subMap.put(6,
Float.valueOf(paintElement.element("width").getText()).floatValue());
- subMap.put(7,
Float.valueOf(paintElement.element("height").getText()).floatValue());
+ subMap.put(3,
Integer.valueOf(paintElement.element("counter").getText()));
+ subMap.put(4,
Float.valueOf(paintElement.element("x").getText()));
+ subMap.put(5,
Float.valueOf(paintElement.element("y").getText()));
+ subMap.put(6,
Float.valueOf(paintElement.element("width").getText()));
+ subMap.put(7,
Float.valueOf(paintElement.element("height").getText()));
subMap.put(8,
paintElement.element("layername").getText());
} catch (Exception err) {
@@ -228,20 +230,20 @@ public class LibraryWmlLoader {
subMap.put(5,
paintElement.element("parentpath").getText());
subMap.put(6, paintElement.element("room").getText());
subMap.put(7, paintElement.element("domain").getText());
- subMap.put(8,
Integer.valueOf(paintElement.element("slideNumber").getText()).intValue());
- subMap.put(9,
Float.valueOf(paintElement.element("innerx").getText()).floatValue());
- subMap.put(10,
Float.valueOf(paintElement.element("innery").getText()).floatValue());
- subMap.put(11,
Float.valueOf(paintElement.element("innerwidth").getText()).floatValue());
- subMap.put(12,
Float.valueOf(paintElement.element("innerheight").getText()).floatValue());
- subMap.put(13,
Integer.valueOf(paintElement.element("zoomlevel").getText()).intValue());
- subMap.put(14,
Float.valueOf(paintElement.element("initwidth").getText()).floatValue());
- subMap.put(15,
Float.valueOf(paintElement.element("initheight").getText()).floatValue());
- subMap.put(16,
Integer.valueOf(paintElement.element("currentzoom").getText()).intValue());
- subMap.put(17,
Integer.valueOf(paintElement.element("counter").getText()).intValue());
- subMap.put(18,
Float.valueOf(paintElement.element("x").getText()).floatValue());
- subMap.put(19,
Float.valueOf(paintElement.element("y").getText()).floatValue());
- subMap.put(20,
Float.valueOf(paintElement.element("width").getText()).floatValue());
- subMap.put(21,
Float.valueOf(paintElement.element("height").getText()).floatValue());
+ subMap.put(8,
Integer.valueOf(paintElement.element("slideNumber").getText()));
+ subMap.put(9,
Float.valueOf(paintElement.element("innerx").getText()));
+ subMap.put(10,
Float.valueOf(paintElement.element("innery").getText()));
+ subMap.put(11,
Float.valueOf(paintElement.element("innerwidth").getText()));
+ subMap.put(12,
Float.valueOf(paintElement.element("innerheight").getText()));
+ subMap.put(13,
Integer.valueOf(paintElement.element("zoomlevel").getText()));
+ subMap.put(14,
Float.valueOf(paintElement.element("initwidth").getText()));
+ subMap.put(15,
Float.valueOf(paintElement.element("initheight").getText()));
+ subMap.put(16,
Integer.valueOf(paintElement.element("currentzoom").getText()));
+ subMap.put(17,
Integer.valueOf(paintElement.element("counter").getText()));
+ subMap.put(18,
Float.valueOf(paintElement.element("x").getText()));
+ subMap.put(19,
Float.valueOf(paintElement.element("y").getText()));
+ subMap.put(20,
Float.valueOf(paintElement.element("width").getText()));
+ subMap.put(21,
Float.valueOf(paintElement.element("height").getText()));
subMap.put(22,
paintElement.element("layername").getText());
} catch (Exception err) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java
Mon Sep 1 13:24:30 2014
@@ -98,7 +98,7 @@ public class LoadLibraryPresentation {
libraryPresentationFile.setName(fileElement.getName());
libraryPresentationFile.setFilename(fileElement.getText());
libraryPresentationFile.setLastmod(fileElement.attribute("lastmod").getText());
-
libraryPresentationFile.setSize(Long.valueOf(fileElement.attribute("size").getText()).longValue());
+
libraryPresentationFile.setSize(Long.valueOf(fileElement.attribute("size").getText()));
return libraryPresentationFile;
@@ -132,7 +132,7 @@ public class LoadLibraryPresentation {
singleThumb.setName(thumbElement.getName());
singleThumb.setFilename(thumbElement.getText());
singleThumb.setLastmod(thumbElement.attribute("lastmod").getText());
-
singleThumb.setSize(Long.valueOf(thumbElement.attribute("size").getText()).longValue());
+
singleThumb.setSize(Long.valueOf(thumbElement.attribute("size").getText()));
thumbMap.getThumbs()[k] = singleThumb;
k++;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
Mon Sep 1 13:24:30 2014
@@ -171,7 +171,7 @@ public class ChatService implements IPen
if (rcl.getIsScreenClient() !=
null && rcl.getIsScreenClient()) {
continue;
}
- if (needModeration &&
Boolean.TRUE != rcl.getIsMod() && Boolean.TRUE != rcl.getIsSuperModerator()) {
+ if (needModeration &&
!Boolean.TRUE.equals(rcl.getIsMod()) &&
!Boolean.TRUE.equals(rcl.getIsSuperModerator())) {
continue;
}
((IServiceCapableConnection)
conn).invoke("sendVarsToMessageWithClient",new Object[] { hsm }, this);
@@ -279,7 +279,7 @@ public class ChatService implements IPen
List<HashMap<String,Object>> myChatList =
myChats.get(room_id);
if (myChatList==null) myChatList = new
LinkedList<HashMap<String,Object>>();
- if (Boolean.TRUE != currentClient.getIsMod() &&
Boolean.TRUE != currentClient.getIsSuperModerator()) {
+ if (!Boolean.TRUE.equals(currentClient.getIsMod()) &&
!Boolean.TRUE.equals(currentClient.getIsSuperModerator())) {
//current user is not moderator, chat history
need to be filtered
List<HashMap<String,Object>> tmpChatList = new
LinkedList<HashMap<String,Object>>(myChatList);
for (int i = tmpChatList.size() - 1; i > -1;
--i) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Mon Sep 1 13:24:30 2014
@@ -130,9 +130,7 @@ public class ScopeApplicationAdapter ext
getCryptKey();
// init your handler here
-
// The scheduled Jobs did go into the Spring-Managed
Beans, see schedulerJobs.service.xml
-
// Spring Definition does not work here, its too early,
Instance is not set yet
emoticonsManager.loadEmot();
@@ -141,8 +139,8 @@ public class ScopeApplicationAdapter ext
}
InitializationContainer.initComplete = true;
- Version.logOMStarted();
- recordingDao.resetProcessingStatus(); //we are starting so
all processing recordings are now errors
+ Version.logOMStarted();
+ recordingDao.resetProcessingStatus(); //we are starting
so all processing recordings are now errors
} catch (Exception err) {
log.error("[appStart]", err);
}
@@ -1134,11 +1132,9 @@ public class ScopeApplicationAdapter ext
log.debug("----------- getBroadCastId");
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- Client currentClient = this.sessionManager
- .getClientByStreamId(streamid, null);
+ Client currentClient =
sessionManager.getClientByStreamId(streamid, null);
currentClient.setBroadCastID(broadCastCounter++);
- this.sessionManager.updateClientByStreamId(streamid,
- currentClient, false, null);
+ sessionManager.updateClientByStreamId(streamid,
currentClient, false, null);
return currentClient.getBroadCastID();
} catch (Exception err) {
log.error("[getBroadCastId]", err);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
Mon Sep 1 13:24:30 2014
@@ -211,7 +211,7 @@ public class DownloadHandler extends Bas
if (!full_path.exists() ||
!full_path.canRead()) {
if (!full_path.canRead()) {
-
log.debug("DownloadHandler: The request DEFAULT-file does not exist / has
already been deleted");
+
log.debug("DownloadHandler: The request DEFAULT-file is not readable ");
} else {
log.debug("DownloadHandler: The request DEFAULT-file does not exist / has
already been deleted");
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
Mon Sep 1 13:24:30 2014
@@ -291,7 +291,7 @@ public class SessionManager implements I
int start, int max, String orderby, boolean
asc) {
SearchResult<Client> sResult = new
SearchResult<Client>();
sResult.setObjectName(Client.class.getName());
-
sResult.setRecords(Long.valueOf(cache.size()).longValue());
+ sResult.setRecords(Long.valueOf(cache.size()));
sResult.setResult(cache.getClientsWithServer());
return sResult;
}
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=1621768&r1=1621767&r2=1621768&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 13:24:30 2014
@@ -327,9 +327,9 @@ public class UserDao implements IDataPro
log.debug("checkUserLogin: login = {}, id = {}", login, id);
long count = em.createNamedQuery("checkUserLogin", Long.class)
.setParameter("login", login)
- .setParameter("id", id == null ? 0 : id)
+ .setParameter("id", id == null ? 0L : id)
.getSingleResult();
- return count == 0;
+ return count == 0L;
}
/**
@@ -345,12 +345,12 @@ public class UserDao implements IDataPro
}
long count = em.createNamedQuery("checkUserEmail", Long.class)
.setParameter("email", email)
- .setParameter("id", id == null ? 0 : id)
+ .setParameter("id", id == null ? 0L : id)
.setParameter("type", Type.contact)
.getSingleResult();
log.debug("size: " + count);
- return count == 0;
+ return count == 0L;
}
public User getByName(String login, Type type) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LanguageImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LanguageImport.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LanguageImport.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/LanguageImport.java
Mon Sep 1 13:24:30 2014
@@ -61,12 +61,10 @@ public class LanguageImport {
for (@SuppressWarnings("unchecked")
Iterator<Element> i = root.elementIterator(); i.hasNext();) {
Element itemObject = i.next();
- Long fieldvalues_id = Long.valueOf(
-
itemObject.attribute("id").getText()).longValue();
+ Long fieldvalues_id =
Long.valueOf(itemObject.attribute("id").getText());
String fieldName =
itemObject.attribute("name").getText();
String value = itemObject.element("value").getText();
- log.info("CHECK " + language_id + "," + fieldvalues_id
+ ","
- + fieldName + "," + value);
+ log.info("CHECK " + language_id + "," + fieldvalues_id
+ "," + fieldName + "," + value);
addFieldValueById(language_id, fieldvalues_id,
fieldName, value, userId);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
Mon Sep 1 13:24:30 2014
@@ -99,7 +99,7 @@ public abstract class ConnectionProperti
Document doc = getDocument(srcXml);
Attr val = getConnectionProperties(doc);
- val = patchAttribute(val, host, port, db, user, pass);
+ patchAttribute(val, host, port, db, user, pass);
TransformerFactory transformerFactory =
TransformerFactory.newInstance();
Transformer transformer = transformerFactory.newTransformer();
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=1621768&r1=1621767&r2=1621768&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 13:24:30 2014
@@ -251,8 +251,7 @@ public class ImportInitvalues {
public void loadErrorMappingsFromXML() throws Exception {
SAXReader reader = new SAXReader();
- Document document = reader.read(new File(
- OmFileHelper.getLanguagesDir(),
OmFileHelper.nameOfErrorFile));
+ Document document = reader.read(new
File(OmFileHelper.getLanguagesDir(), OmFileHelper.nameOfErrorFile));
Element root = document.getRootElement();
@@ -266,24 +265,24 @@ public class ImportInitvalues {
Long errortype_id = null;
for (@SuppressWarnings("unchecked")
- Iterator<Element> itSub = row.elementIterator("field");
itSub
- .hasNext();) {
-
+ Iterator<Element> itSub = row.elementIterator("field");
itSub.hasNext();) {
Element field = itSub.next();
String name = field.attributeValue("name");
String text = field.getText();
// System.out.println("NAME | TEXT "+name+" |
"+text);
- if (name.equals("errorvalues_id"))
- errorvalues_id =
Long.valueOf(text).longValue();
- if (name.equals("fieldvalues_id"))
- fieldvalues_id =
Long.valueOf(text).longValue();
- if (name.equals("errortype_id"))
- errortype_id =
Long.valueOf(text).longValue();
+ if (name.equals("errorvalues_id")) {
+ errorvalues_id = Long.valueOf(text);
+ }
+ if (name.equals("fieldvalues_id")) {
+ fieldvalues_id = Long.valueOf(text);
+ }
+ if (name.equals("errortype_id")) {
+ errortype_id = Long.valueOf(text);
+ }
}
- errorManagement.addErrorValues(errorvalues_id,
errortype_id,
- fieldvalues_id);
+ errorManagement.addErrorValues(errorvalues_id,
errortype_id, fieldvalues_id);
}
log.debug("ErrorMappings ADDED");
}
@@ -704,7 +703,7 @@ public class ImportInitvalues {
log.debug("loadInitLanguages rtl from xml: " + rtl);
- Boolean langRtl = Boolean.TRUE.equals(rtl);
+ boolean langRtl = Boolean.TRUE.toString().equals(rtl);
long ticks = System.currentTimeMillis();
FieldLanguage lang = fieldLanguageDaoImpl.addLanguage(langId,
langName, langRtl, code);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java
Mon Sep 1 13:24:30 2014
@@ -30,31 +30,25 @@ import org.dom4j.io.XMLWriter;
public class InstallationDocumentHandler {
public static void createDocument(Integer stepNo) throws Exception {
-
Document document = DocumentHelper.createDocument();
-
- Element root = document.addElement( "install" );
+
+ Element root = document.addElement("install");
Element step = root.addElement("step");
-
+
step.addElement("stepnumber").addText(stepNo.toString());
- step.addElement("stepname").addText("Step "+stepNo);
-
+ step.addElement("stepname").addText("Step " + stepNo);
+
XMLWriter writer = new XMLWriter(new
FileWriter(OmFileHelper.getInstallFile()));
- writer.write( document );
- writer.close();
-
+ writer.write(document);
+ writer.close();
}
-
- public static int getCurrentStepNumber() throws Exception{
-
- SAXReader reader = new SAXReader();
- Document document = reader.read(OmFileHelper.getInstallFile());
-
- Node node = document.selectSingleNode( "//install/step/stepnumber" );
-
- return Integer.valueOf(node.getText()).intValue();
-
+
+ public static int getCurrentStepNumber() throws Exception {
+ SAXReader reader = new SAXReader();
+ Document document = reader.read(OmFileHelper.getInstallFile());
+
+ Node node =
document.selectSingleNode("//install/step/stepnumber");
+
+ return Integer.valueOf(node.getText()).intValue();
}
-
-
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CaptureScreen.java
Mon Sep 1 13:24:30 2014
@@ -111,7 +111,7 @@ final class CaptureScreen extends Thread
}
frames.offer(data);
se.createUnalteredFrame();
- } catch (IOException e) {
+ } catch (Exception e) {
log.error("Error while
encoding: ", e);
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Mon Sep 1 13:24:30 2014
@@ -163,15 +163,15 @@ public class UserManager implements IUse
public Long logout(String SID, long USER_ID) {
sessiondataDao.updateUser(SID, 0, false, null);
- return new Long(-12);
+ return -12L;
}
public List<Userdata> getUserdataDashBoard(Long user_id) {
- if (user_id.longValue() > 0) {
+ if (user_id != null && user_id.longValue() > 0) {
try {
TypedQuery<Userdata> query = em
.createQuery("select c from
Userdata as c where c.user_id = :user_id AND c.deleted <> :deleted",
Userdata.class);
- query.setParameter("user_id",
user_id.longValue());
+ query.setParameter("user_id", user_id);
query.setParameter("deleted", true);
List<Userdata> ll = query.getResultList();
return ll;
@@ -184,11 +184,11 @@ public class UserManager implements IUse
public Userdata getUserdataByKey(Long user_id, String DATA_KEY) {
Userdata userdata = new Userdata();
- if (user_id.longValue() > 0) {
+ if (user_id != null && user_id.longValue() > 0) {
try {
TypedQuery<Userdata> query = em
.createQuery("select c from
Userdata as c where c.user_id = :user_id AND c.data_key = :data_key AND
c.deleted <> :deleted", Userdata.class);
- query.setParameter("user_id",
user_id.longValue());
+ query.setParameter("user_id", user_id);
query.setParameter("data_key", DATA_KEY);
query.setParameter("deleted", true);
for (Iterator<Userdata> it2 =
query.getResultList().iterator(); it2
@@ -213,7 +213,7 @@ public class UserManager implements IUse
.setParameter("DATA_KEY", DATA_KEY)
.setParameter("USER_ID", USER_ID)
.setParameter("DATA", DATA)
- .setParameter("updatetime", new
Long(-1))
+ .setParameter("updatetime", -1L)
.setParameter("Comment", Comment)
.setParameter("DATA_ID",
DATA_ID).executeUpdate();
res = "Success" + updatedEntities;
@@ -231,9 +231,9 @@ public class UserManager implements IUse
+ "comment = :comment where user_id=
:user_id AND data_key = :data_key";
int updatedEntities = em.createQuery(hqlUpdate)
.setParameter("data", DATA)
- .setParameter("updatetime", new
Long(-1))
+ .setParameter("updatetime", -1L)
.setParameter("comment", Comment)
- .setParameter("user_id",
USER_ID.longValue())
+ .setParameter("user_id", USER_ID)
.setParameter("data_key",
DATA_KEY).executeUpdate();
res = "Success" + updatedEntities;
} catch (Exception ex2) {
@@ -251,10 +251,10 @@ public class UserManager implements IUse
userdata.setStarttime(new Date());
userdata.setUpdatetime(null);
userdata.setComment(Comment);
- userdata.setUser_id(new Long(USER_ID));
+ userdata.setUser_id(USER_ID);
userdata.setDeleted(false);
try {
- userdata = em.merge(userdata);
+ em.merge(userdata);
ret = "success";
} catch (Exception ex2) {
log.error("addUserdata", ex2);
@@ -330,7 +330,7 @@ public class UserManager implements IUse
sendSMS, sendConfirmation,
timezoneUtil.getTimeZone(jNameTimeZone), false, "", "", false, true, null);
if (user_id > 0 && sendConfirmation) {
- return new Long(-40);
+ return -40L;
}
return user_id;
@@ -402,7 +402,7 @@ public class UserManager implements IUse
String sendMail =
emailManagement.sendMail(login,
password, email, link,
sendConfirmation);
if (!sendMail.equals("success"))
- return new Long(-19);
+ return -19L;
}
Address adr = usersDao.getAddress(street, zip,
town, states_id, additionalname, fax, phone, email);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java
Mon Sep 1 13:24:30 2014
@@ -190,7 +190,7 @@ public class GeomPoint extends Point {
// if the directional constants are equal, the lines
are parallel,
// meaning there is no intersection point.
- if( k1 == k2 ) return null;
+ if (java.lang.Double.compare(k1, k2) == 0) return null;
//log.debug("neither");
// log.debug("k1: "+k1);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
Mon Sep 1 13:24:30 2014
@@ -203,11 +203,16 @@ public class IcalHandler {
filerPath = filerPath + ".ics";
}
- FileOutputStream fout = new FileOutputStream(filerPath);
-
- CalendarOutputter outputter = new CalendarOutputter();
- outputter.output(icsCalendar, fout);
- fout.close();
+ FileOutputStream fout = null;
+ try {
+ fout = new FileOutputStream(filerPath);
+ CalendarOutputter outputter = new CalendarOutputter();
+ outputter.output(icsCalendar, fout);
+ } finally {
+ if (fout != null) {
+ fout.close();
+ }
+ }
}
//
------------------------------------------------------------------------------------------
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
Mon Sep 1 13:24:30 2014
@@ -273,7 +273,7 @@ public class WebSession extends Abstract
setUser(u);
return true;
} catch (OmException oe) {
- loginError = oe.getCode() == null ? -1 : oe.getCode();
+ loginError = oe.getCode() == null ? -1L : oe.getCode();
}
return false;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
Mon Sep 1 13:24:30 2014
@@ -23,6 +23,8 @@ import static org.apache.openmeetings.we
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URI;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -70,10 +72,18 @@ public class ProfileImagePanel extends B
protected byte[] getData(Attributes attributes)
{
String uri =
getBean(UserDao.class).get(userId).getPictureuri();
File img =
OmFileHelper.getUserProfilePicture(userId, uri);
+ InputStream is = null;
try {
- return IOUtils.toByteArray(new
FileInputStream(img));
+ is = new FileInputStream(img);
+ return IOUtils.toByteArray(is);
} catch (Exception e) {
log.error("failed to get bytes
from image", e);
+ } finally {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (IOException e)
{}
+ }
}
return null;
}
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=1621768&r1=1621767&r2=1621768&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 13:24:30 2014
@@ -430,7 +430,7 @@ public class RoomPanel extends BasePanel
response.render(OnDomReadyHeaderItem.forScript(aab.getCallbackScript()));
}
- class FilesTreeProvider implements ITreeProvider<FileExplorerItem> {
+ static class FilesTreeProvider implements
ITreeProvider<FileExplorerItem> {
private static final long serialVersionUID = 1L;
Long roomId = null;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
Mon Sep 1 13:24:30 2014
@@ -20,6 +20,8 @@ package org.apache.openmeetings.web.user
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
import org.apache.openmeetings.db.dao.room.RoomDao;
@@ -123,9 +125,17 @@ public class RoomsPanel extends UserPane
uri =
Application.getBean(UserDao.class).get(userId > 0 ? userId :
-userId).getPictureuri();
}
File img =
OmFileHelper.getUserProfilePicture(userId, uri);
+ InputStream is = null;
try {
- return
IOUtils.toByteArray(new FileInputStream(img));
+ is = new
FileInputStream(img);
+ return
IOUtils.toByteArray(is);
} catch (Exception e) {
+ } finally {
+ if (is != null) {
+ try {
+
is.close();
+ } catch
(IOException e) {}
+ }
}
return null;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1621768&r1=1621767&r2=1621768&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Mon Sep 1 13:24:30 2014
@@ -1653,15 +1653,11 @@ public class RoomWebService {
Date dTo = null;
if (valid == 2) {
- Integer validFromHour = Integer.valueOf(
-
validFromTime.substring(0, 2)).intValue();
- Integer validFromMinute =
Integer.valueOf(
-
validFromTime.substring(3, 5)).intValue();
-
- Integer validToHour = Integer.valueOf(
-
validToTime.substring(0, 2)).intValue();
- Integer validToMinute = Integer.valueOf(
-
validToTime.substring(3, 5)).intValue();
+ Integer validFromHour =
Integer.valueOf(validFromTime.substring(0, 2));
+ Integer validFromMinute =
Integer.valueOf(validFromTime.substring(3, 5));
+
+ Integer validToHour =
Integer.valueOf(validToTime.substring(0, 2));
+ Integer validToMinute =
Integer.valueOf(validToTime.substring(3, 5));
log.info("validFromHour: " +
validFromHour);
log.info("validFromMinute: " +
validFromMinute);
@@ -1779,15 +1775,11 @@ public class RoomWebService {
Date dTo = null;
if (valid == 2) {
- Integer validFromHour = Integer.valueOf(
-
validFromTime.substring(0, 2)).intValue();
- Integer validFromMinute =
Integer.valueOf(
-
validFromTime.substring(3, 5)).intValue();
-
- Integer validToHour = Integer.valueOf(
-
validToTime.substring(0, 2)).intValue();
- Integer validToMinute = Integer.valueOf(
-
validToTime.substring(3, 5)).intValue();
+ Integer validFromHour =
Integer.valueOf(validFromTime.substring(0, 2));
+ Integer validFromMinute =
Integer.valueOf(validFromTime.substring(3, 5));
+
+ Integer validToHour =
Integer.valueOf(validToTime.substring(0, 2));
+ Integer validToMinute =
Integer.valueOf(validToTime.substring(3, 5));
log.info("validFromHour: " +
validFromHour);
log.info("validFromMinute: " +
validFromMinute);
