Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrbrooks2010-07-24 17:38:31 +0000
committerrbrooks2010-07-24 17:38:31 +0000
commit4081f04850d3eff9eb1bd7241763707bfbb43a45 (patch)
tree258620df94d4b24077ff103a6c4dea9cb78493fb /plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee
parent4ed8bddc791fda93940f238c5135556a07041dc0 (diff)
downloadorg.eclipse.osee-4081f04850d3eff9eb1bd7241763707bfbb43a45.tar.gz
org.eclipse.osee-4081f04850d3eff9eb1bd7241763707bfbb43a45.tar.xz
org.eclipse.osee-4081f04850d3eff9eb1bd7241763707bfbb43a45.zip
applied Eclipse source cleanup
Diffstat (limited to 'plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee')
-rw-r--r--plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java2
-rw-r--r--plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyDbServer.java4
-rw-r--r--plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/EmbeddedDerbyConnection.java2
-rw-r--r--plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/internal/Activator.java2
4 files changed, 8 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java
index ad9ebc00974..b918317b941 100644
--- a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java
+++ b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyClientConnection.java
@@ -25,6 +25,7 @@ public class DerbyClientConnection implements IConnectionFactory {
private static final String driver = "org.apache.derby.jdbc.ClientDriver";
private boolean firstTime = true;
+ @Override
public Connection getConnection(Properties properties, String connectionURL) throws Exception {
Class.forName(driver);
@@ -39,6 +40,7 @@ public class DerbyClientConnection implements IConnectionFactory {
return connection;
}
+ @Override
public String getDriver() {
return driver;
}
diff --git a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyDbServer.java b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyDbServer.java
index d0333a35511..47e03c45d18 100644
--- a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyDbServer.java
+++ b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/DerbyDbServer.java
@@ -47,7 +47,7 @@ public class DerbyDbServer {
} else {
OseeLog.log(Activator.class, Level.INFO, "Exiting, since unable to connect to Derby Network Server.");
OseeLog.log(Activator.class, Level.INFO,
- "Please try to increase the amount of time to keep trying to connect to the Server.");
+ "Please try to increase the amount of time to keep trying to connect to the Server.");
}
} catch (Exception ex) {
OseeLog.log(Activator.class, Level.SEVERE, ex);
@@ -101,7 +101,7 @@ public class DerbyDbServer {
knowIfServerUp = true;
} catch (Exception e) {
OseeLog.log(Activator.class, Level.SEVERE,
- "Unable to obtain a connection to network server, trying again after 3000 ms.", e);
+ "Unable to obtain a connection to network server, trying again after 3000 ms.", e);
Thread.sleep(3000);
}
}
diff --git a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/EmbeddedDerbyConnection.java b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/EmbeddedDerbyConnection.java
index 37ec120f180..42f0616d6be 100644
--- a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/EmbeddedDerbyConnection.java
+++ b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/EmbeddedDerbyConnection.java
@@ -22,12 +22,14 @@ public class EmbeddedDerbyConnection implements IConnectionFactory {
private static final String driver = "org.apache.derby.jdbc.EmbeddedDriver";
+ @Override
public Connection getConnection(Properties properties, String connectionURL) throws Exception {
Class.forName(driver);
Connection connection = DriverManager.getConnection(connectionURL, properties);
return connection;
}
+ @Override
public String getDriver() {
return driver;
}
diff --git a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/internal/Activator.java b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/internal/Activator.java
index dd00d6420f6..f71d3b2a72b 100644
--- a/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/internal/Activator.java
+++ b/plugins/org.eclipse.osee.framework.derby/src/org/eclipse/osee/framework/derby/internal/Activator.java
@@ -18,9 +18,11 @@ import org.osgi.framework.BundleContext;
*/
public class Activator implements BundleActivator {
+ @Override
public void start(BundleContext context) throws Exception {
}
+ @Override
public void stop(BundleContext context) throws Exception {
}

Back to the top