Revision: 3588
Author: [email protected]
Date: Mon Jun 7 15:17:26 2010
Log: Removed console-killing logging from the NetworkConflictResolver, and
added an annotation to the KettleDataSoureOptionsPanel.
http://code.google.com/p/power-architect/source/detail?r=3588
Modified:
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/KettleDataSourceOptionsPanel.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Mon May 31 10:58:46 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Mon Jun 7 15:17:26 2010
@@ -937,7 +937,7 @@
} catch (AccessDeniedException ade) {
throw new AccessDeniedException("Access Denied");
} catch (Exception ex) {
- throw new RuntimeException("Unable to post json to server: " +
jsonArray + "\n"+ ex.getMessage());
+ throw new RuntimeException("Unable to post json to server:
\n"+ ex.getMessage());
}
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/KettleDataSourceOptionsPanel.java
Fri May 29 07:57:16 2009
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/KettleDataSourceOptionsPanel.java
Mon Jun 7 15:17:26 2010
@@ -21,6 +21,7 @@
import java.util.Map;
+import javax.annotation.Nonnull;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
@@ -68,7 +69,7 @@
*
* @param dbcs The data source to edit. Null is not allowed.
*/
- public KettleDataSourceOptionsPanel(JDBCDataSource dbcs) {
+ public KettleDataSourceOptionsPanel(@Nonnull JDBCDataSource dbcs) {
this.panel = buildKettleOptionsPanel();
this.dbcs = dbcs;
