You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/05 14:56:00 UTC
svn commit: r1227595 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker:
AbstractTracked.java BundleTracker.java
Author: davsclaus
Date: Thu Jan 5 13:56:00 2012
New Revision: 1227595
URL: http://svn.apache.org/viewvc?rev=1227595&view=rev
Log:
CAMEL-4796: Applied the remove NON-NLS patch. Thanks to Babak.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java?rev=1227595&r1=1227594&r2=1227595&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java Thu Jan 5 13:56:00 2012
@@ -139,7 +139,7 @@ abstract class AbstractTracked {
continue;
}
if (DEBUG) {
- System.out.println("AbstractTracked.setInitial: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.setInitial: " + item);
}
initial.add(item);
}
@@ -169,7 +169,7 @@ abstract class AbstractTracked {
if (tracked.get(item) != null) {
/* if we are already tracking this item */
if (DEBUG) {
- System.out.println("AbstractTracked.trackInitial[already tracked]: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.trackInitial[already tracked]: " + item);
}
continue; /* skip this item */
}
@@ -178,14 +178,14 @@ abstract class AbstractTracked {
* if this item is already in the process of being added.
*/
if (DEBUG) {
- System.out.println("AbstractTracked.trackInitial[already adding]: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.trackInitial[already adding]: " + item);
}
continue; /* skip this item */
}
adding.add(item);
}
if (DEBUG) {
- System.out.println("AbstractTracked.trackInitial: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.trackInitial: " + item);
}
trackAdding(item, null); /*
* Begin tracking it. We call trackAdding
@@ -220,14 +220,14 @@ abstract class AbstractTracked {
if (adding.contains(item)) {
/* if this item is already in the process of being added. */
if (DEBUG) {
- System.out.println("AbstractTracked.track[already adding]: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.track[already adding]: " + item);
}
return;
}
adding.add(item); /* mark this item is being added */
} else { /* we are currently tracking this item */
if (DEBUG) {
- System.out.println("AbstractTracked.track[modified]: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.track[modified]: " + item);
}
modified(); /* increment modification count */
}
@@ -256,7 +256,7 @@ abstract class AbstractTracked {
@SuppressWarnings("unchecked")
private void trackAdding(final Object item, final Object related) {
if (DEBUG) {
- System.out.println("AbstractTracked.trackAdding: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.trackAdding: " + item);
}
Object object = null;
boolean becameUntracked = false;
@@ -289,7 +289,7 @@ abstract class AbstractTracked {
*/
if (becameUntracked && (object != null)) {
if (DEBUG) {
- System.out.println("AbstractTracked.trackAdding[removed]: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.trackAdding[removed]: " + item);
}
/* Call customizer outside of synchronized region */
customizerRemoved(item, related, object);
@@ -314,7 +314,7 @@ abstract class AbstractTracked {
* of initial references to process
*/
if (DEBUG) {
- System.out.println("AbstractTracked.untrack[removed from initial]: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.untrack[removed from initial]: " + item);
}
return; /*
* we have removed it from the list and it will not be
@@ -327,7 +327,7 @@ abstract class AbstractTracked {
* added
*/
if (DEBUG) {
- System.out.println("AbstractTracked.untrack[being added]: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.untrack[being added]: " + item);
}
return; /*
* in case the item is untracked while in the process of
@@ -344,7 +344,7 @@ abstract class AbstractTracked {
modified(); /* increment modification count */
}
if (DEBUG) {
- System.out.println("AbstractTracked.untrack[removed]: " + item); //$NON-NLS-1$
+ System.out.println("AbstractTracked.untrack[removed]: " + item);
}
/* Call customizer outside of synchronized region */
customizerRemoved(item, related, object);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java?rev=1227595&r1=1227594&r2=1227595&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/BundleTracker.java Thu Jan 5 13:56:00 2012
@@ -149,7 +149,7 @@ public class BundleTracker implements Bu
return;
}
if (DEBUG) {
- System.out.println("BundleTracker.open"); //$NON-NLS-1$
+ System.out.println("BundleTracker.open");
}
t = new Tracked();
synchronized (t) {
@@ -192,7 +192,7 @@ public class BundleTracker implements Bu
return;
}
if (DEBUG) {
- System.out.println("BundleTracker.close"); //$NON-NLS-1$
+ System.out.println("BundleTracker.close");
}
outgoing.close();
bundles = getBundles();
@@ -400,7 +400,7 @@ public class BundleTracker implements Bu
final Bundle bundle = event.getBundle();
final int state = bundle.getState();
if (DEBUG) {
- System.out.println("BundleTracker.Tracked.bundleChanged[" + state + "]: " + bundle); //$NON-NLS-1$ //$NON-NLS-2$
+ System.out.println("BundleTracker.Tracked.bundleChanged[" + state + "]: " + bundle);
}
if ((state & mask) != 0) {