# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1240057215 -7200
# Node ID 8594250b1d1cc7ff39764d2b4c010aac7ba8635b
# Parent  12b890a6392af9f2fb9e0cc7f48dbb3657942c61
make it all again compile

diff -r 12b890a6392a -r 8594250b1d1c base/src/java/lang/String.d
--- a/base/src/java/lang/String.d	Sat Apr 18 13:58:35 2009 +0200
+++ b/base/src/java/lang/String.d	Sat Apr 18 14:20:15 2009 +0200
@@ -17,23 +17,23 @@
 }
 
 version(Tango){
-    alias char[] String;
-    alias char[] CString;
-    alias wchar[] String16;
-    alias wchar[] CString16;
-    alias char*   ICharPtr;
-    alias char*   CCharPtr;
-    alias wchar*  CWCharPtr;
-    alias wchar*  IWCharPtr;
+    public alias char[] String;
+    public alias char[] CString;
+    public alias wchar[] String16;
+    public alias wchar[] CString16;
+    public alias char*   ICharPtr;
+    public alias char*   CCharPtr;
+    public alias wchar*  CWCharPtr;
+    public alias wchar*  IWCharPtr;
 } else { // Phobos
-    alias string String;
-    alias wstring String16;
-    mixin("alias const(char)[]     CString;");
-    mixin("alias const(wchar)[]    CString16;");
-    mixin("alias invariant(char)*  ICharPtr;");
-    mixin("alias const(char)*      CCharPtr;");
-    mixin("alias const(wchar)*     CWCharPtr;");
-    mixin("alias invariant(wchar)* IWCharPtr;");
+    public alias string String;
+    public alias wstring String16;
+    mixin("public alias const(char)[]     CString;");
+    mixin("public alias const(wchar)[]    CString16;");
+    mixin("public alias invariant(char)*  ICharPtr;");
+    mixin("public alias const(char)*      CCharPtr;");
+    mixin("public alias const(wchar)*     CWCharPtr;");
+    mixin("public alias invariant(wchar)* IWCharPtr;");
 }
 
 int codepointIndexToIndex( CString str, int cpIndex ){
diff -r 12b890a6392a -r 8594250b1d1c base/src/java/lang/all.d
--- a/base/src/java/lang/all.d	Sat Apr 18 13:58:35 2009 +0200
+++ b/base/src/java/lang/all.d	Sat Apr 18 14:20:15 2009 +0200
@@ -13,16 +13,16 @@
 public import java.lang.Math;
 public import java.lang.Number;
 public import java.lang.Runnable;
+public import java.lang.Short;
 public import java.lang.String;
-public import java.lang.Short;
 public import java.lang.StringBuffer;
 public import java.lang.System;
 public import java.lang.Thread;
 public import java.lang.ThreadLocal;
 
-public import java.lang.util;
 public import java.lang.exceptions;
 public import java.lang.interfaces;
+public import java.lang.util;
 public import java.lang.wrappers;
 
 
diff -r 12b890a6392a -r 8594250b1d1c org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobListeners.d
--- a/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobListeners.d	Sat Apr 18 13:58:35 2009 +0200
+++ b/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobListeners.d	Sat Apr 18 14:20:15 2009 +0200
@@ -22,7 +22,7 @@
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.IJobChangeListener;
 import org.eclipse.core.runtime.jobs.Job;
-import org.osgi.util.NLS;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.core.internal.jobs.JobChangeEvent;
 import org.eclipse.core.internal.jobs.InternalJob;
 import org.eclipse.core.internal.jobs.JobOSGiUtils;
diff -r 12b890a6392a -r 8594250b1d1c org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.d
--- a/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.d	Sat Apr 18 13:58:35 2009 +0200
+++ b/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.d	Sat Apr 18 14:20:15 2009 +0200
@@ -45,7 +45,7 @@
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.core.runtime.jobs.LockListener;
 import org.eclipse.core.runtime.jobs.ProgressProvider;
-import org.osgi.util.NLS;
+import org.eclipse.osgi.util.NLS;
 
 import org.eclipse.core.internal.jobs.ImplicitJobs;
 import org.eclipse.core.internal.jobs.WorkerPool;
diff -r 12b890a6392a -r 8594250b1d1c org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobMessages.d
--- a/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobMessages.d	Sat Apr 18 13:58:35 2009 +0200
+++ b/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobMessages.d	Sat Apr 18 14:20:15 2009 +0200
@@ -17,7 +17,7 @@
 
 import java.lang.all;
 
-import org.osgi.util.NLS;
+import org.eclipse.osgi.util.NLS;
 
 /**
  * Job plugin message catalog
diff -r 12b890a6392a -r 8594250b1d1c org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Worker.d
--- a/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Worker.d	Sat Apr 18 13:58:35 2009 +0200
+++ b/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/Worker.d	Sat Apr 18 14:20:15 2009 +0200
@@ -21,7 +21,7 @@
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.osgi.util.NLS;
+import org.eclipse.osgi.util.NLS;
 
 import org.eclipse.core.internal.jobs.InternalJob;
 import org.eclipse.core.internal.jobs.WorkerPool;
diff -r 12b890a6392a -r 8594250b1d1c org.eclipse.equinox.common/src/org/eclipse/core/runtime/IProgressMonitor.d
--- a/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IProgressMonitor.d	Sat Apr 18 13:58:35 2009 +0200
+++ b/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IProgressMonitor.d	Sat Apr 18 14:20:15 2009 +0200
@@ -13,6 +13,7 @@
 module org.eclipse.core.runtime.IProgressMonitor;
 
 import java.lang.all;
+import java.lang.String;
 
 /**
  * The <code>IProgressMonitor</code> interface is implemented
diff -r 12b890a6392a -r 8594250b1d1c org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.d
--- a/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.d	Sat Apr 18 13:58:35 2009 +0200
+++ b/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.d	Sat Apr 18 14:20:15 2009 +0200
@@ -10,7 +10,7 @@
  * Port to the D programming language:
  *     Frank Benoit <benoit@tionex.de>
  *******************************************************************************/
-module org.osgi.util.NLS;
+module org.eclipse.osgi.util.NLS;
 
 import java.lang.all;