Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-12-22 10:10:10 +0000
committerEike Stepper2010-12-22 10:10:10 +0000
commitff128e9fdf823dad08f92d68ff95eaaddce478bc (patch)
tree1dbd107602f0553be5f935adf72d07cc8f6e6e0d
parente89b4d46b027d0a192902534151b800e1e2e9ca5 (diff)
downloadcdo-ff128e9fdf823dad08f92d68ff95eaaddce478bc.tar.gz
cdo-ff128e9fdf823dad08f92d68ff95eaaddce478bc.tar.xz
cdo-ff128e9fdf823dad08f92d68ff95eaaddce478bc.zip
Don't use System.err
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/GenerateHBMTest.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.hibernate.server/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleEFeatureAnnotator.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java12
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExpectedIOTest.java12
-rw-r--r--plugins/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java4
-rw-r--r--plugins/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java4
13 files changed, 36 insertions, 28 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/GenerateHBMTest.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/GenerateHBMTest.java
index e54ad91144..3f8e2cd4f7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/GenerateHBMTest.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.client/src/org/eclipse/emf/cdo/examples/hibernate/client/GenerateHBMTest.java
@@ -16,6 +16,9 @@ import junit.framework.TestCase;
import org.eclipse.emf.cdo.examples.company.CompanyPackage;
import org.eclipse.emf.cdo.server.hibernate.teneo.CDOMappingGenerator;
+
+import org.eclipse.net4j.util.io.IOUtil;
+
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.teneo.PersistenceOptions;
@@ -35,7 +38,7 @@ import org.eclipse.emf.teneo.PersistenceOptions;
* <li>org.apache.commons.logging</li>
* </ul>
* The first two dependencies normally do not exist on a client side application.
- *
+ *
* @author Martin Taal
*/
public class GenerateHBMTest extends TestCase
@@ -61,6 +64,6 @@ public class GenerateHBMTest extends TestCase
// show it somewhere....
// then store the hbm somewhere in a file and change it manually
- System.err.println(mapping);
+ IOUtil.ERR().println(mapping);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/META-INF/MANIFEST.MF
index c3de77cc37..e6d917cb0f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/META-INF/MANIFEST.MF
@@ -7,9 +7,10 @@ Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-RegisterBuddy: org.eclipse.emf.cdo.server.hibernate, org.eclipse.emf.cdo.server.hibernate.teneo
-Require-Bundle: org.eclipse.emf.cdo.server.hibernate.teneo;bundle-version="3.0.0",
+Require-Bundle: org.eclipse.emf.cdo.server.hibernate.teneo;bundle-version="[3.0.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
+ org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)"
Import-Package: org.eclipse.emf.teneo.annotations.mapper;version="[1.1.2,2.0.0)",
org.eclipse.emf.teneo.annotations.pamodel;version="[1.1.2,2.0.0)",
org.eclipse.emf.teneo.annotations.pannotation;version="[1.1.2,2.0.0)",
diff --git a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleEFeatureAnnotator.java b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleEFeatureAnnotator.java
index 9e034c48da..1d05b862cc 100644
--- a/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleEFeatureAnnotator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.hibernate.server/src/org/eclipse/emf/cdo/examples/hibernate/server/CDOExampleEFeatureAnnotator.java
@@ -12,12 +12,15 @@
package org.eclipse.emf.cdo.examples.hibernate.server;
import org.eclipse.emf.cdo.server.hibernate.teneo.CDOEFeatureAnnotator;
+
+import org.eclipse.net4j.util.io.IOUtil;
+
import org.eclipse.emf.teneo.annotations.pamodel.PAnnotatedEStructuralFeature;
/**
* An example of providing an extension for Teneo Mapping. See <a
* href="http://wiki.eclipse.org/Teneo/Hibernate/Extensions">here</a> for more information on Teneo extensions.
- *
+ *
* @author Martin Taal
*/
public class CDOExampleEFeatureAnnotator extends CDOEFeatureAnnotator
@@ -25,7 +28,7 @@ public class CDOExampleEFeatureAnnotator extends CDOEFeatureAnnotator
@Override
public void annotate(PAnnotatedEStructuralFeature aStructuralFeature)
{
- System.err.println("This method should be called"); //$NON-NLS-1$
+ IOUtil.ERR().println("This method should be called"); //$NON-NLS-1$
super.annotate(aStructuralFeature);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java
index e7d7d1a916..2931c0db55 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate.teneo/src/org/eclipse/emf/cdo/server/hibernate/internal/teneo/TeneoHibernateMappingProvider.java
@@ -134,8 +134,6 @@ public class TeneoHibernateMappingProvider extends HibernateMappingProvider
// to solve an issue with older versions of teneo
hbm = hbm.replaceAll("_cont", "cont"); //$NON-NLS-1$ //$NON-NLS-2$
- // System.err.println(hbm);
-
return hbm;
}
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
index e1a3dfd6a8..afe9bdd017 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/HibernateStore.java
@@ -487,7 +487,6 @@ public class HibernateStore extends Store implements IHibernateStore
if (mappingProvider != null)
{
mappingProvider.setHibernateStore(this);
- // System.err.println(mappingProvider.getMapping());
hibernateConfiguration.addXML(mappingProvider.getMapping());
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java
index e1ded1939a..8eca118fc3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/AllTestsDBPsql.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.cdo.tests.db.bundle.OM;
import org.eclipse.net4j.db.DBUtil;
import org.eclipse.net4j.db.IDBAdapter;
import org.eclipse.net4j.db.postgresql.PostgreSQLAdapter;
+import org.eclipse.net4j.util.io.IOUtil;
import org.postgresql.jdbc3.Jdbc3SimpleDataSource;
@@ -160,7 +161,7 @@ public class AllTestsDBPsql extends DBConfigs
}
catch (SQLException ignore)
{
- System.err.println(ignore);
+ IOUtil.ERR().println(ignore);
}
finally
{
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java
index 1b2345994c..3074c2f45d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java
@@ -639,7 +639,7 @@ public class WorkspaceTest extends AbstractCDOTest
public void testCheckinAfterAdd() throws Exception
{
InternalCDOWorkspace workspace = checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE);
- System.err.println("Checkout done");
+ IOUtil.ERR().println("Checkout done");
CDOTransaction transaction = workspace.openTransaction();
CDOResource resource = transaction.getResource(RESOURCE);
@@ -1205,7 +1205,7 @@ public class WorkspaceTest extends AbstractCDOTest
File folder = TMPUtil.createTempFolder("cdo-");
CDOWorkspaceBase base = CDOWorkspaceUtil.createFolderWorkspaceBase(folder);
- System.err.println("CDOWorkspaceBaseline: " + folder.getAbsolutePath());
+ IOUtil.ERR().println("CDOWorkspaceBaseline: " + folder.getAbsolutePath());
InternalCDOWorkspace workspace = (InternalCDOWorkspace)CDOWorkspaceUtil.checkout(localStore, base, remote,
branchPath, timeStamp);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java
index d041f66578..4ddc212533 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java
@@ -151,7 +151,7 @@ public class Bugzilla_327604_Test extends AbstractCDOTest
File folder = TMPUtil.createTempFolder("cdo-");
CDOWorkspaceBase base = CDOWorkspaceUtil.createFolderWorkspaceBase(folder);
- System.err.println("CDOWorkspaceBaseline: " + folder.getAbsolutePath());
+ IOUtil.ERR().println("CDOWorkspaceBaseline: " + folder.getAbsolutePath());
InternalCDOWorkspace workspace = (InternalCDOWorkspace)CDOWorkspaceUtil.checkout(localStore, base, remote,
branchPath, timeStamp);
diff --git a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java
index 43cfdfc744..a2ebdda13a 100644
--- a/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java
+++ b/plugins/org.eclipse.emf.cdo.workspace.efs/src/org/eclipse/emf/cdo/workspace/internal/efs/CDOResourceNodeStore.java
@@ -105,7 +105,6 @@ public final class CDOResourceNodeStore extends AbstractResourceNodeStore
public void close() throws IOException
{
byte[] bytes = toByteArray();
- System.err.println(new String(bytes));
InputStream in = new ByteArrayInputStream(bytes);
XMIResource xmiResource = new XMIResourceImpl();
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
index 26f66625e5..f3c9a7c27b 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionUtil;
import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDeltaUtil;
import org.eclipse.emf.cdo.internal.server.Repository;
import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
+import org.eclipse.emf.cdo.server.CDOServerBrowser;
import org.eclipse.emf.cdo.server.CDOServerUtil;
import org.eclipse.emf.cdo.server.IRepository.Props;
import org.eclipse.emf.cdo.server.IStore;
@@ -142,11 +143,11 @@ public class CDOWorkspaceImpl implements InternalCDOWorkspace
localRepository = createLocalRepository(local);
- // Map<String, InternalRepository> repositories = new HashMap<String, InternalRepository>();
- // repositories.put(localRepository.getName(), localRepository);
- // CDOServerBrowser browser = new CDOServerBrowser(repositories);
- // browser.setPort(7778);
- // browser.activate();
+ Map<String, InternalRepository> repositories = new HashMap<String, InternalRepository>();
+ repositories.put(localRepository.getName(), localRepository);
+ CDOServerBrowser browser = new CDOServerBrowser(repositories);
+ browser.setPort(7778);
+ browser.activate();
this.base = base;
this.base.init(this);
@@ -175,7 +176,6 @@ public class CDOWorkspaceImpl implements InternalCDOWorkspace
public boolean handleRevision(CDORevision revision)
{
InternalCDORevision rev = (InternalCDORevision)revision;
- System.err.println(rev);
accessor.rawStore(rev, monitor);
long commitTime = revision.getTimeStamp();
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExpectedIOTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExpectedIOTest.java
index fd613300a3..6ff9079d76 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExpectedIOTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExpectedIOTest.java
@@ -56,7 +56,7 @@ public class ExpectedIOTest extends AbstractOMTest
for (int i = 0; i < LOOPS; i++)
{
out.writeInt(i);
- System.err.println(i);
+ IOUtil.ERR().println(i);
ConcurrencyUtil.sleep(100);
}
}
@@ -135,7 +135,7 @@ public class ExpectedIOTest extends AbstractOMTest
for (int i = 0; i < LOOPS; i++)
{
out.writeInt(i);
- System.err.println(i);
+ IOUtil.ERR().println(i);
ConcurrencyUtil.sleep(100);
}
}
@@ -215,10 +215,10 @@ public class ExpectedIOTest extends AbstractOMTest
{
int c = 'a' + i;
out.write(c);
- System.err.println(c);
+ IOUtil.ERR().println(c);
out.write(c + 1);
- System.err.println(c + 1);
+ IOUtil.ERR().println(c + 1);
ConcurrencyUtil.sleep(100);
}
}
@@ -311,10 +311,10 @@ public class ExpectedIOTest extends AbstractOMTest
{
int c = 'a' + i;
out.write(c);
- System.err.println(c);
+ IOUtil.ERR().println(c);
out.write(c + 1);
- System.err.println(c + 1);
+ IOUtil.ERR().println(c + 1);
ConcurrencyUtil.sleep(100);
}
}
diff --git a/plugins/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java b/plugins/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java
index 8f44429b00..a7451b5226 100644
--- a/plugins/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java
+++ b/plugins/org.gastro.rcp.department/src/com/swtdesigner/SWTResourceManager.java
@@ -1,5 +1,7 @@
package com.swtdesigner;
+import org.eclipse.net4j.util.io.IOUtil;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
@@ -439,7 +441,7 @@ public class SWTResourceManager
}
catch (Throwable e)
{
- System.err.println("Unable to set underline or strikeout" + " (probably on a non-Windows platform). " + e); //$NON-NLS-1$ //$NON-NLS-2$
+ IOUtil.ERR().println("Unable to set underline or strikeout" + " (probably on a non-Windows platform). " + e); //$NON-NLS-1$ //$NON-NLS-2$
}
}
diff --git a/plugins/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java b/plugins/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java
index 4e41d978de..d00071980f 100644
--- a/plugins/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java
+++ b/plugins/org.gastro.rcp.table/src/com/swtdesigner/SWTResourceManager.java
@@ -1,5 +1,7 @@
package com.swtdesigner;
+import org.eclipse.net4j.util.io.IOUtil;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
@@ -440,7 +442,7 @@ public class SWTResourceManager
}
catch (Throwable e)
{
- System.err.println("Unable to set underline or strikeout" + " (probably on a non-Windows platform). " + e); //$NON-NLS-1$ //$NON-NLS-2$
+ IOUtil.ERR().println("Unable to set underline or strikeout" + " (probably on a non-Windows platform). " + e); //$NON-NLS-1$ //$NON-NLS-2$
}
}

Back to the top