Skip to content
This repository
Browse code

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

  • Loading branch information...
commit 0aa36fa712f3267c289f0c727fbd0031235ea22e 2 parents 3095002 + 0909b30
Shalom authored May 02, 2012
1  plugins/com.aptana.core/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
17 17
 Bundle-ActivationPolicy: lazy
18 18
 Export-Package: com.aptana.core,
19 19
  com.aptana.core.build,
  20
+ com.aptana.core.diagnostic,
20 21
  com.aptana.core.logging,
21 22
  com.aptana.core.projects.templates,
22 23
  com.aptana.core.resources,
2  .../src/com/aptana/ui/diagnostic/IDiagnosticLog.java → ...rc/com/aptana/core/diagnostic/IDiagnosticLog.java
@@ -5,7 +5,7 @@
5 5
  * Please see the license.html included with this distribution for details.
6 6
  * Any modifications to this file must keep this entire header intact.
7 7
  */
8  
-package com.aptana.ui.diagnostic;
  8
+package com.aptana.core.diagnostic;
9 9
 
10 10
 public interface IDiagnosticLog
11 11
 {
2  plugins/com.aptana.ui/src/com/aptana/ui/EclipseDiagnosticLog.java
@@ -9,9 +9,9 @@
9 9
 
10 10
 import org.eclipse.core.runtime.Platform;
11 11
 
  12
+import com.aptana.core.diagnostic.IDiagnosticLog;
12 13
 import com.aptana.core.util.EclipseUtil;
13 14
 import com.aptana.core.util.StringUtil;
14  
-import com.aptana.ui.diagnostic.IDiagnosticLog;
15 15
 
16 16
 public class EclipseDiagnosticLog implements IDiagnosticLog
17 17
 {
2  plugins/com.aptana.ui/src/com/aptana/ui/commands/DiagnosticHandler.java
@@ -17,9 +17,9 @@
17 17
 import org.eclipse.core.runtime.Status;
18 18
 import org.eclipse.core.runtime.jobs.Job;
19 19
 
  20
+import com.aptana.core.diagnostic.IDiagnosticLog;
20 21
 import com.aptana.core.util.StringUtil;
21 22
 import com.aptana.ui.diagnostic.DiagnosticManager;
22  
-import com.aptana.ui.diagnostic.IDiagnosticLog;
23 23
 import com.aptana.ui.dialogs.DiagnosticDialog;
24 24
 import com.aptana.ui.util.UIUtils;
25 25
 
1  plugins/com.aptana.ui/src/com/aptana/ui/diagnostic/DiagnosticManager.java
@@ -17,6 +17,7 @@
17 17
 import org.eclipse.core.runtime.CoreException;
18 18
 import org.eclipse.core.runtime.IConfigurationElement;
19 19
 
  20
+import com.aptana.core.diagnostic.IDiagnosticLog;
20 21
 import com.aptana.core.logging.IdeLog;
21 22
 import com.aptana.core.util.CollectionsUtil;
22 23
 import com.aptana.core.util.EclipseUtil;

0 notes on commit 0aa36fa

Please sign in to comment.
Something went wrong with that request. Please try again.