Revision: 4205
Author: solomax666
Date: Mon Sep 5 07:51:58 2011
Log: - Issue 1472
- code cleanup
http://code.google.com/p/openmeetings/source/detail?r=4205
Modified:
/trunk/singlewebapp/src/META-INF/persistence.xml
/trunk/singlewebapp/src/client/org/openmeetings/client/gui/ClientStartScreen.java
/trunk/singlewebapp/src/screenviewer/org/openmeetings/webstart/screen/CaptureScreen.java
/trunk/singlewebapp/src/test/org/openmeetings/test/backup/TestStringReplace.java
=======================================
--- /trunk/singlewebapp/src/META-INF/persistence.xml Sun Sep 4 12:25:02
2011
+++ /trunk/singlewebapp/src/META-INF/persistence.xml Mon Sep 5 07:51:58
2011
@@ -57,7 +57,7 @@
<class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
<properties>
- <property name="openjpa.ConnectionProperties"
value="DriverClassName=com.mysql.jdbc.Driver,
Url=jdbc:mysql://192.168.115.130:3306/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8&connectionCollation=utf8_general_ci&cachePrepStmts=true&cacheCallableStatements=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&prepStmtCacheSize=3000&prepStmtCacheSqlLimit=1000,
MaxActive=100, MaxWait=10000, TestOnBorrow=true,
poolPreparedStatements=true, Username=root, Password="/>
+ <property name="openjpa.ConnectionProperties"
value="DriverClassName=com.mysql.jdbc.Driver,
Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8&connectionCollation=utf8_general_ci&cachePrepStmts=true&cacheCallableStatements=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&prepStmtCacheSize=3000&prepStmtCacheSqlLimit=1000,
MaxActive=100, MaxWait=10000, TestOnBorrow=true,
poolPreparedStatements=true, Username=root, Password="/>
<property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema"/>
<property name="openjpa.RuntimeUnenhancedClasses"
value="unsupported"/>
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"
/>
=======================================
---
/trunk/singlewebapp/src/client/org/openmeetings/client/gui/ClientStartScreen.java
Sat Nov 21 04:39:39 2009
+++
/trunk/singlewebapp/src/client/org/openmeetings/client/gui/ClientStartScreen.java
Mon Sep 5 07:51:58 2011
@@ -1,22 +1,36 @@
package org.openmeetings.client.gui;
+import java.awt.Color;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.util.Date;
-import java.awt.*;
-import java.awt.event.*;
-
import javax.imageio.ImageIO;
-import javax.swing.*;
+import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.apache.log4j.Logger;
-import org.openmeetings.client.screen.ClientBlankArea;
-import org.openmeetings.client.screen.ClientCaptureScreen;
-import org.openmeetings.client.screen.ClientSentScreen;
import org.openmeetings.client.beans.ClientConnectionBean;
import org.openmeetings.client.beans.ClientStatusBean;
import org.openmeetings.client.beans.ClientVirtualScreenBean;
+import org.openmeetings.client.screen.ClientBlankArea;
+import org.openmeetings.client.screen.ClientCaptureScreen;
+import org.openmeetings.client.screen.ClientSentScreen;
import org.openmeetings.client.transport.ClientPacketMinaProcess;
import org.openmeetings.client.transport.ClientTransportMinaPool;
import org.openmeetings.client.util.ClientRasterList;
@@ -60,8 +74,6 @@
JLabel vScreenIconUp;
JLabel vScreenIconDown;
- private JLabel myBandWidhtTestLabel;
-
private String label730 = "Desktop Publisher";
private String label731 = "This application will publish your screen";
private String label732 = "Start Sharing";
=======================================
---
/trunk/singlewebapp/src/screenviewer/org/openmeetings/webstart/screen/CaptureScreen.java
Sun Sep 4 12:25:02 2011
+++
/trunk/singlewebapp/src/screenviewer/org/openmeetings/webstart/screen/CaptureScreen.java
Mon Sep 5 07:51:58 2011
@@ -16,7 +16,6 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.Date;
-import java.util.Iterator;
import java.util.Locale;
import javax.imageio.IIOImage;
=======================================
---
/trunk/singlewebapp/src/test/org/openmeetings/test/backup/TestStringReplace.java
Mon Aug 15 11:47:14 2011
+++
/trunk/singlewebapp/src/test/org/openmeetings/test/backup/TestStringReplace.java
Mon Sep 5 07:51:58 2011
@@ -1,6 +1,8 @@
package org.openmeetings.test.backup;
import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import java.util.Iterator;
@@ -53,7 +55,7 @@
Element organisation1 =
organisations.addElement("organisation");
-
organisation1.addElement("name").setText(formatString("orgÜÖÄüäö1"));
+
organisation1.addElement("name").setText(formatString("org\u01e6\u03ce\u0677\u042b1"));
organisation1.addElement("organisation_id").setText(formatString("1"));
organisation1.addElement("deleted").addCDATA("false");
@@ -63,12 +65,14 @@
organisation2.addElement("organisation_id").setText(formatString("2"));
organisation2.addElement("deleted").setText(formatString("false"));
- for (Iterator<Element> innerIter =
organisations.elementIterator( "organisation" ); innerIter.hasNext(); ) {
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> innerIter =
organisations.elementIterator( "organisation" ); innerIter.hasNext(); ) {
Element orgObject = innerIter.next();
String name = orgObject.element("name").getText();
- String deleted = orgObject.element("deleted").getText();
+ assertNotNull(name);
+ assertNotNull(orgObject.element("deleted").getText());
System.out.println(name);
}
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
