Permalink
Browse files

Merge branch 'release' of github.com:aptana/studio3 into release

  • Loading branch information...
Shalom Gibly
Shalom Gibly committed May 3, 2012
2 parents 3095002 + 0909b30 commit 0aa36fa712f3267c289f0c727fbd0031235ea22e
@@ -17,6 +17,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: com.aptana.core,
com.aptana.core.build,
+ com.aptana.core.diagnostic,
com.aptana.core.logging,
com.aptana.core.projects.templates,
com.aptana.core.resources,
@@ -5,7 +5,7 @@
* Please see the license.html included with this distribution for details.
* Any modifications to this file must keep this entire header intact.
*/
-package com.aptana.ui.diagnostic;
+package com.aptana.core.diagnostic;
public interface IDiagnosticLog
{
@@ -9,9 +9,9 @@
import org.eclipse.core.runtime.Platform;
+import com.aptana.core.diagnostic.IDiagnosticLog;
import com.aptana.core.util.EclipseUtil;
import com.aptana.core.util.StringUtil;
-import com.aptana.ui.diagnostic.IDiagnosticLog;
public class EclipseDiagnosticLog implements IDiagnosticLog
{
@@ -17,9 +17,9 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import com.aptana.core.diagnostic.IDiagnosticLog;
import com.aptana.core.util.StringUtil;
import com.aptana.ui.diagnostic.DiagnosticManager;
-import com.aptana.ui.diagnostic.IDiagnosticLog;
import com.aptana.ui.dialogs.DiagnosticDialog;
import com.aptana.ui.util.UIUtils;
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
+import com.aptana.core.diagnostic.IDiagnosticLog;
import com.aptana.core.logging.IdeLog;
import com.aptana.core.util.CollectionsUtil;
import com.aptana.core.util.EclipseUtil;

0 comments on commit 0aa36fa

Please sign in to comment.