Skip to content

Commit 383d90b

Browse files

File tree

27 files changed

+140
-33
lines changed

27 files changed

+140
-33
lines changed

graph-database-support-plugin/src/main/resources/META-INF/plugin.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@
112112
anchor="bottom"
113113
secondary="false"
114114
factoryClass="com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.ConsoleToolWindow"
115-
icon="/graphdb/icons/window/graph_13x13.png"/>
115+
icon="GraphIcons.Window.GRAPH"/>
116116
<toolWindow id="Graph Database"
117117
anchor="right"
118118
secondary="false"
119119
factoryClass="com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.DataSourcesToolWindow"
120-
icon="/graphdb/icons/window/graph_13x13.png"/>
120+
icon="GraphIcons.Window.GRAPH"/>
121121
<actionPromoter implementation="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExecuteQueryActionPromoter"/>
122122
<applicationService serviceInterface="com.neueda.jetbrains.plugin.graphdb.visualization.services.LookAndFeelService"
123123
serviceImplementation="com.neueda.jetbrains.plugin.graphdb.jetbrains.services.IdeaLookAndFeelService"/>
@@ -179,26 +179,26 @@
179179
<!-- Graph Database support -->
180180
<group id="GraphDatabaseActionGroup"
181181
text="Graph Database" description="Execute graph database queries"
182-
icon="/graphdb/icons/window/graph_13x13.png" popup="true">
182+
icon="GraphIcons.Window.GRAPH" popup="true">
183183

184184
<action id="GraphDatabaseActionGroup.ExecuteQuery"
185185
class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExecuteQueryAction"
186186
text="Execute query"
187-
icon="/general/run.png"
187+
icon="AllIcons.RunConfigurations.TestState.Run"
188188
description="Execute query">
189189
<keyboard-shortcut first-keystroke="ctrl ENTER"
190190
keymap="$default"/>
191191
</action>
192192
<action id="GraphDatabaseActionGroup.ExplainQuery"
193193
class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExplainQueryAction"
194194
text="Explain query"
195-
icon="/general/run.png"
195+
icon="AllIcons.RunConfigurations.TestState.Run"
196196
description="Explain query">
197197
</action>
198198
<action id="GraphDatabaseActionGroup.ProfileQuery"
199199
class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ProfileQueryAction"
200200
text="Profile query"
201-
icon="/general/run.png"
201+
icon="AllIcons.RunConfigurations.TestState.Run"
202202
description="Profile query">
203203
</action>
204204
<add-to-group group-id="EditorPopupMenu"/>
@@ -210,30 +210,30 @@
210210
<action id="GraphDatabaseConsoleToolWindowActions.ExecuteQuery"
211211
class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExecuteQueryAction"
212212
text="Execute query"
213-
icon="/toolwindows/toolWindowRun.png"
213+
icon="AllIcons.Toolwindows.ToolWindowRun"
214214
description="Execute query">
215215
</action>
216216
<action id="GraphDatabaseConsoleToolWindowActions.CleanCanvas"
217217
class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.ui.console.CleanCanvasAction"
218218
text="Clean canvas"
219-
icon="/actions/refresh.png"
219+
icon="AllIcons.Actions.Refresh"
220220
description="Clean canvas">
221221
</action>
222222
<action id="GraphDatabaseConsoleToolWindowActions.CopyQueryOutput"
223223
class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.ui.console.CopyQueryOutputAction"
224224
text="Copy query result to clipboard"
225-
icon="/actions/copy.png"
225+
icon="AllIcons.Actions.Copy"
226226
description="Copy query result to clipboard">
227227
</action>
228228
</group>
229229

230230
<group id="GraphDatabaseFileActions"
231231
text="Graph Database File Actions" description="Graph Database File Actions"
232-
icon="/graphdb/icons/window/graph_13x13.png" popup="true">
232+
icon="GraphIcons.Window.GRAPH" popup="true">
233233
<action id="GraphDatabaseFileActions.ExecuteAll"
234234
class="com.neueda.jetbrains.plugin.graphdb.jetbrains.actions.execute.ExecuteAllAction"
235235
text="Execute All"
236-
icon="/general/run.png">
236+
icon="AllIcons.RunConfigurations.TestState.Run">
237237
</action>
238238
<add-to-group group-id="ProjectViewPopupMenu"/>
239239
</group>
Lines changed: 2 additions & 0 deletions
Loading
Lines changed: 2 additions & 0 deletions
Loading

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/CypherIcons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.neueda.jetbrains.plugin.graphdb.language.cypher;
22

3-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
3+
import icons.GraphIcons;
44

55
import javax.swing.Icon;
66

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherBuiltInFunctionElement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
44
import com.intellij.codeInsight.lookup.LookupElement;
55
import com.intellij.codeInsight.lookup.LookupElementBuilder;
6-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
6+
import icons.GraphIcons;
77

88
public class CypherBuiltInFunctionElement implements CypherElement {
99

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherLabelElement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.intellij.codeInsight.lookup.LookupElement;
44
import com.intellij.codeInsight.lookup.LookupElementBuilder;
5-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
5+
import icons.GraphIcons;
66

77
public class CypherLabelElement implements CypherElement {
88

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherProcedureElement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
44
import com.intellij.codeInsight.lookup.LookupElement;
55
import com.intellij.codeInsight.lookup.LookupElementBuilder;
6-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
6+
import icons.GraphIcons;
77
import org.jetbrains.annotations.Nullable;
88

99
public class CypherProcedureElement implements

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherPropertyKeyElement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.intellij.codeInsight.lookup.LookupElement;
44
import com.intellij.codeInsight.lookup.LookupElementBuilder;
5-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
5+
import icons.GraphIcons;
66

77
public class CypherPropertyKeyElement implements CypherElement {
88

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherRelationshipTypeElement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.intellij.codeInsight.lookup.LookupElement;
44
import com.intellij.codeInsight.lookup.LookupElementBuilder;
5-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
5+
import icons.GraphIcons;
66

77
public class CypherRelationshipTypeElement implements CypherElement {
88

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/completion/metadata/elements/CypherUserFunctionElement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
44
import com.intellij.codeInsight.lookup.LookupElement;
55
import com.intellij.codeInsight.lookup.LookupElementBuilder;
6-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
6+
import icons.GraphIcons;
77
import org.jetbrains.annotations.Nullable;
88

99
public class CypherUserFunctionElement implements

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/references/impl/CypherLabelNameReference.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.neueda.jetbrains.plugin.graphdb.language.cypher.psi.CypherTypes;
88
import com.neueda.jetbrains.plugin.graphdb.language.cypher.references.CypherReferenceBase;
99
import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.CypherUtil;
10-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
10+
import icons.GraphIcons;
1111
import org.jetbrains.annotations.NotNull;
1212

1313
/**

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/references/impl/CypherPropertyKeyNameReference.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.neueda.jetbrains.plugin.graphdb.language.cypher.psi.CypherTypes;
88
import com.neueda.jetbrains.plugin.graphdb.language.cypher.references.CypherReferenceBase;
99
import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.CypherUtil;
10-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
10+
import icons.GraphIcons;
1111
import org.jetbrains.annotations.NotNull;
1212

1313
public class CypherPropertyKeyNameReference extends CypherReferenceBase {

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/references/impl/CypherRelTypeNameReference.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.neueda.jetbrains.plugin.graphdb.language.cypher.psi.CypherTypes;
88
import com.neueda.jetbrains.plugin.graphdb.language.cypher.references.CypherReferenceBase;
99
import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.CypherUtil;
10-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
10+
import icons.GraphIcons;
1111
import org.jetbrains.annotations.NotNull;
1212

1313
/**

language/cypher/src/main/java/com/neueda/jetbrains/plugin/graphdb/language/cypher/references/impl/CypherVariableReference.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.neueda.jetbrains.plugin.graphdb.language.cypher.references.CypherReferenceBase;
1010
import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.CypherUtil;
1111
import com.neueda.jetbrains.plugin.graphdb.language.cypher.util.PsiTraversalUtilities;
12-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
12+
import icons.GraphIcons;
1313
import org.jetbrains.annotations.NotNull;
1414

1515
/**
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.neueda.jetbrains.plugin.graphdb.platform;
1+
package icons;
22

33
import com.intellij.icons.AllIcons;
44

@@ -8,18 +8,16 @@
88

99
public final class GraphIcons {
1010
public static final class Database {
11-
public static final Icon UNKNOWN = getIcon("/graphdb/icons/database/unknown_16x16.png");
12-
public static final Icon NEO4J = getIcon("/graphdb/icons/database/neo4j_16x16.png");
13-
public static final Icon ORIENTDB = getIcon("/graphdb/icons/database/orientdb_16x16.png");
11+
public static final Icon UNKNOWN = AllIcons.FileTypes.Unknown;
12+
public static final Icon NEO4J = getIcon("/graphdb/icons/database/neo4j.svg");
1413
}
1514

1615
public static final class Language {
17-
public static final Icon CYPHER = getIcon("/graphdb/icons/language/cypher_16x16.png");
16+
public static final Icon CYPHER = getIcon("/graphdb/icons/language/cypher.svg");
1817
}
1918

2019
public static final class Window {
21-
public static final Icon DATABASE = getIcon("/graphdb/icons/window/database_12x16.png");
22-
public static final Icon GRAPH = getIcon("/graphdb/icons/window/graph_13x13.png");
20+
public static final Icon GRAPH = getIcon("/META-INF/pluginIcon.svg");
2321
}
2422

2523
public static final class Nodes {
Lines changed: 104 additions & 0 deletions
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/component/datasource/DataSourceDescription.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.neueda.jetbrains.plugin.graphdb.jetbrains.component.datasource;
22

3-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
3+
import icons.GraphIcons;
44

55
import javax.swing.Icon;
66

ui/jetbrains/src/main/java/com/neueda/jetbrains/plugin/graphdb/jetbrains/ui/datasource/interactions/NewDataSourceActionGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.intellij.openapi.project.Project;
77
import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.DataSourcesView;
88
import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.datasource.interactions.neo4j.bolt.Neo4jBoltDataSourceDialog;
9-
import com.neueda.jetbrains.plugin.graphdb.platform.GraphIcons;
9+
import icons.GraphIcons;
1010
import org.jetbrains.annotations.NotNull;
1111
import org.jetbrains.annotations.Nullable;
1212

0 commit comments

Comments
 (0)