Inline some static fields referencing newly introduced generated *Ico…

…ns classes
donirn · Apr 10, 2013 · 56dce7e · 56dce7e
1 parent c421e3f
commit 56dce7e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacetType.java b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineFacetType.java
@@ -1,12 +1,12 @@
 package com.intellij.appengine.facet;
 
-import com.intellij.appengine.util.AppEngineUtil;
 import com.intellij.facet.Facet;
 import com.intellij.facet.FacetType;
 import com.intellij.javaee.web.facet.WebFacet;
 import com.intellij.openapi.module.JavaModuleType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleType;
+import icons.GoogleAppEngineIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -43,6 +43,6 @@ public String getDefaultFacetName() {
 
   @Override
   public Icon getIcon() {
-    return AppEngineUtil.APP_ENGINE_ICON;
+    return GoogleAppEngineIcons.AppEngine;
   }
 }
diff --git a/...p-engine/source/com/intellij/appengine/facet/AppEngineTemplateGroupDescriptorFactory.java b/...p-engine/source/com/intellij/appengine/facet/AppEngineTemplateGroupDescriptorFactory.java
@@ -1,10 +1,10 @@
 package com.intellij.appengine.facet;
 
-import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptorFactory;
-import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptor;
 import com.intellij.ide.fileTemplates.FileTemplateDescriptor;
-import com.intellij.appengine.util.AppEngineUtil;
+import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptor;
+import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptorFactory;
 import com.intellij.openapi.fileTypes.StdFileTypes;
+import icons.GoogleAppEngineIcons;
 import org.jetbrains.annotations.NonNls;
 
 /**
@@ -19,6 +19,6 @@ public FileTemplateGroupDescriptor getFileTemplatesDescriptor() {
     final FileTemplateDescriptor appEngineXml = new FileTemplateDescriptor(APP_ENGINE_WEB_XML_TEMPLATE, StdFileTypes.XML.getIcon());
     final FileTemplateDescriptor jdoConfigXml = new FileTemplateDescriptor(APP_ENGINE_JDO_CONFIG_TEMPLATE, StdFileTypes.XML.getIcon());
     final FileTemplateDescriptor jpaConfigXml = new FileTemplateDescriptor(APP_ENGINE_JPA_CONFIG_TEMPLATE, StdFileTypes.XML.getIcon());
-    return new FileTemplateGroupDescriptor("Google App Engine", AppEngineUtil.APP_ENGINE_ICON, appEngineXml, jdoConfigXml, jpaConfigXml);
+    return new FileTemplateGroupDescriptor("Google App Engine", GoogleAppEngineIcons.AppEngine, appEngineXml, jdoConfigXml, jpaConfigXml);
   }
 }
diff --git a/plugins/google-app-engine/source/com/intellij/appengine/gwt/AppEngineGwtServer.java b/plugins/google-app-engine/source/com/intellij/appengine/gwt/AppEngineGwtServer.java
@@ -2,14 +2,14 @@
 
 import com.intellij.appengine.sdk.AppEngineSdk;
 import com.intellij.appengine.server.integration.AppEngineServerData;
-import com.intellij.appengine.util.AppEngineUtil;
 import com.intellij.execution.configurations.JavaParameters;
 import com.intellij.execution.configurations.ParametersList;
 import com.intellij.gwt.facet.GwtFacet;
 import com.intellij.gwt.run.GwtDevModeServer;
 import com.intellij.javaee.appServerIntegrations.ApplicationServer;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
+import icons.GoogleAppEngineIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -28,7 +28,7 @@ public AppEngineGwtServer(@NotNull ApplicationServer server) {
 
   @Override
   public Icon getIcon() {
-    return AppEngineUtil.APP_ENGINE_ICON;
+    return GoogleAppEngineIcons.AppEngine;
   }
 
   @Override

diff --git a/...p-engine/source/com/intellij/appengine/server/integration/AppEngineServerIntegration.java b/...p-engine/source/com/intellij/appengine/server/integration/AppEngineServerIntegration.java
@@ -1,10 +1,10 @@
 package com.intellij.appengine.server.integration;
 
-import com.intellij.appengine.util.AppEngineUtil;
 import com.intellij.javaee.appServerIntegrations.AppServerIntegration;
 import com.intellij.javaee.appServerIntegrations.ApplicationServerHelper;
 import com.intellij.javaee.appServerIntegrations.ApplicationServerPersistentDataEditor;
 import com.intellij.javaee.openapi.ex.AppServerIntegrationsManager;
+import icons.GoogleAppEngineIcons;
 
 import javax.swing.*;
 
@@ -23,7 +23,7 @@ public AppEngineServerIntegration() {
   }
 
   public Icon getIcon() {
-    return AppEngineUtil.APP_ENGINE_ICON;
+    return GoogleAppEngineIcons.AppEngine;
   }
 
   public String getPresentableName() {

diff --git a/...app-engine/source/com/intellij/appengine/server/run/AppEngineServerConfigurationType.java b/...app-engine/source/com/intellij/appengine/server/run/AppEngineServerConfigurationType.java
@@ -1,16 +1,16 @@
 package com.intellij.appengine.server.run;
 
+import com.intellij.appengine.server.instance.AppEngineServerModel;
+import com.intellij.appengine.server.integration.AppEngineServerIntegration;
 import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.RunConfiguration;
-import com.intellij.javaee.run.configuration.J2EEConfigurationType;
-import com.intellij.javaee.run.configuration.J2EEConfigurationFactory;
 import com.intellij.javaee.appServerIntegrations.AppServerIntegration;
-import com.intellij.openapi.project.Project;
+import com.intellij.javaee.run.configuration.J2EEConfigurationFactory;
+import com.intellij.javaee.run.configuration.J2EEConfigurationType;
 import com.intellij.openapi.extensions.Extensions;
-import com.intellij.appengine.server.integration.AppEngineServerIntegration;
-import com.intellij.appengine.server.instance.AppEngineServerModel;
-import com.intellij.appengine.util.AppEngineUtil;
+import com.intellij.openapi.project.Project;
 import com.intellij.util.containers.ContainerUtil;
+import icons.GoogleAppEngineIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -40,7 +40,7 @@ public String getConfigurationTypeDescription() {
 
   @Nullable
   public Icon getIcon() {
-    return AppEngineUtil.APP_ENGINE_ICON;
+    return GoogleAppEngineIcons.AppEngine;
   }
 
   @Override

diff --git a/plugins/google-app-engine/source/com/intellij/appengine/util/AppEngineUtil.java b/plugins/google-app-engine/source/com/intellij/appengine/util/AppEngineUtil.java
@@ -12,7 +12,6 @@
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.artifacts.ArtifactManager;
 import com.intellij.ui.ListCellRendererWrapper;
-import icons.GoogleAppEngineIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -28,7 +27,6 @@
  * @author nik
  */
 public class AppEngineUtil {
-  public static final Icon APP_ENGINE_ICON = GoogleAppEngineIcons.AppEngine;
   @NonNls public static final String APP_ENGINE_WEB_XML_NAME = "appengine-web.xml";
   @NonNls public static final String JDO_CONFIG_XML_NAME = "jdoconfig.xml";
   @NonNls public static final String JPA_CONFIG_XML_NAME = "persistence.xml";