diff --git a/src/main/java/de/marhali/easyi18n/TranslatorToolWindowFactory.java b/src/main/java/de/marhali/easyi18n/TranslatorToolWindowFactory.java index 281419f..161d4b4 100644 --- a/src/main/java/de/marhali/easyi18n/TranslatorToolWindowFactory.java +++ b/src/main/java/de/marhali/easyi18n/TranslatorToolWindowFactory.java @@ -9,9 +9,9 @@ import com.intellij.ui.content.ContentFactory; import de.marhali.easyi18n.service.DataStore; import de.marhali.easyi18n.service.WindowManager; -import de.marhali.easyi18n.ui.action.*; -import de.marhali.easyi18n.ui.tabs.TableView; -import de.marhali.easyi18n.ui.tabs.TreeView; +import de.marhali.easyi18n.action.*; +import de.marhali.easyi18n.tabs.TableView; +import de.marhali.easyi18n.tabs.TreeView; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/ui/action/AddAction.java b/src/main/java/de/marhali/easyi18n/action/AddAction.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/ui/action/AddAction.java rename to src/main/java/de/marhali/easyi18n/action/AddAction.java index 317b971..20f9dba 100644 --- a/src/main/java/de/marhali/easyi18n/ui/action/AddAction.java +++ b/src/main/java/de/marhali/easyi18n/action/AddAction.java @@ -1,11 +1,11 @@ -package de.marhali.easyi18n.ui.action; +package de.marhali.easyi18n.action; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import de.marhali.easyi18n.service.WindowManager; -import de.marhali.easyi18n.ui.dialog.AddDialog; +import de.marhali.easyi18n.dialog.AddDialog; import de.marhali.easyi18n.util.TreeUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/ui/action/ReloadAction.java b/src/main/java/de/marhali/easyi18n/action/ReloadAction.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/ui/action/ReloadAction.java rename to src/main/java/de/marhali/easyi18n/action/ReloadAction.java index ed7ac40..5930963 100644 --- a/src/main/java/de/marhali/easyi18n/ui/action/ReloadAction.java +++ b/src/main/java/de/marhali/easyi18n/action/ReloadAction.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.action; +package de.marhali.easyi18n.action; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; diff --git a/src/main/java/de/marhali/easyi18n/ui/action/SearchAction.java b/src/main/java/de/marhali/easyi18n/action/SearchAction.java similarity index 98% rename from src/main/java/de/marhali/easyi18n/ui/action/SearchAction.java rename to src/main/java/de/marhali/easyi18n/action/SearchAction.java index 123a615..42b16c7 100644 --- a/src/main/java/de/marhali/easyi18n/ui/action/SearchAction.java +++ b/src/main/java/de/marhali/easyi18n/action/SearchAction.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.action; +package de.marhali.easyi18n.action; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/src/main/java/de/marhali/easyi18n/ui/action/SettingsAction.java b/src/main/java/de/marhali/easyi18n/action/SettingsAction.java similarity index 87% rename from src/main/java/de/marhali/easyi18n/ui/action/SettingsAction.java rename to src/main/java/de/marhali/easyi18n/action/SettingsAction.java index 6bd209d..42feefa 100644 --- a/src/main/java/de/marhali/easyi18n/ui/action/SettingsAction.java +++ b/src/main/java/de/marhali/easyi18n/action/SettingsAction.java @@ -1,9 +1,9 @@ -package de.marhali.easyi18n.ui.action; +package de.marhali.easyi18n.action; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import de.marhali.easyi18n.ui.dialog.SettingsDialog; +import de.marhali.easyi18n.dialog.SettingsDialog; import org.jetbrains.annotations.NotNull; import java.util.ResourceBundle; diff --git a/src/main/java/de/marhali/easyi18n/ui/action/treeview/CollapseTreeViewAction.java b/src/main/java/de/marhali/easyi18n/action/treeview/CollapseTreeViewAction.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/ui/action/treeview/CollapseTreeViewAction.java rename to src/main/java/de/marhali/easyi18n/action/treeview/CollapseTreeViewAction.java index 0d33a4e..a8390c3 100644 --- a/src/main/java/de/marhali/easyi18n/ui/action/treeview/CollapseTreeViewAction.java +++ b/src/main/java/de/marhali/easyi18n/action/treeview/CollapseTreeViewAction.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.action.treeview; +package de.marhali.easyi18n.action.treeview; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; diff --git a/src/main/java/de/marhali/easyi18n/ui/action/treeview/ExpandTreeViewAction.java b/src/main/java/de/marhali/easyi18n/action/treeview/ExpandTreeViewAction.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/ui/action/treeview/ExpandTreeViewAction.java rename to src/main/java/de/marhali/easyi18n/action/treeview/ExpandTreeViewAction.java index 915e7b4..0e07c9e 100644 --- a/src/main/java/de/marhali/easyi18n/ui/action/treeview/ExpandTreeViewAction.java +++ b/src/main/java/de/marhali/easyi18n/action/treeview/ExpandTreeViewAction.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.action.treeview; +package de.marhali.easyi18n.action.treeview; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; diff --git a/src/main/java/de/marhali/easyi18n/ui/dialog/AddDialog.java b/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java similarity index 98% rename from src/main/java/de/marhali/easyi18n/ui/dialog/AddDialog.java rename to src/main/java/de/marhali/easyi18n/dialog/AddDialog.java index 12527f9..8a50820 100644 --- a/src/main/java/de/marhali/easyi18n/ui/dialog/AddDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.dialog; +package de.marhali.easyi18n.dialog; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogBuilder; diff --git a/src/main/java/de/marhali/easyi18n/ui/dialog/EditDialog.java b/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java similarity index 96% rename from src/main/java/de/marhali/easyi18n/ui/dialog/EditDialog.java rename to src/main/java/de/marhali/easyi18n/dialog/EditDialog.java index 00884eb..09f3e21 100644 --- a/src/main/java/de/marhali/easyi18n/ui/dialog/EditDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.dialog; +package de.marhali.easyi18n.dialog; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogBuilder; @@ -10,7 +10,7 @@ import de.marhali.easyi18n.service.DataStore; import de.marhali.easyi18n.model.KeyedTranslation; import de.marhali.easyi18n.model.TranslationDelete; import de.marhali.easyi18n.model.TranslationUpdate; -import de.marhali.easyi18n.ui.dialog.descriptor.DeleteActionDescriptor; +import de.marhali.easyi18n.dialog.descriptor.DeleteActionDescriptor; import javax.swing.*; import javax.swing.border.EtchedBorder; diff --git a/src/main/java/de/marhali/easyi18n/ui/dialog/SettingsDialog.java b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java similarity index 98% rename from src/main/java/de/marhali/easyi18n/ui/dialog/SettingsDialog.java rename to src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java index eeafe30..2d1f9e4 100644 --- a/src/main/java/de/marhali/easyi18n/ui/dialog/SettingsDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.dialog; +package de.marhali.easyi18n.dialog; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/de/marhali/easyi18n/ui/dialog/descriptor/DeleteActionDescriptor.java b/src/main/java/de/marhali/easyi18n/dialog/descriptor/DeleteActionDescriptor.java similarity index 95% rename from src/main/java/de/marhali/easyi18n/ui/dialog/descriptor/DeleteActionDescriptor.java rename to src/main/java/de/marhali/easyi18n/dialog/descriptor/DeleteActionDescriptor.java index a1cd61e..3460601 100644 --- a/src/main/java/de/marhali/easyi18n/ui/dialog/descriptor/DeleteActionDescriptor.java +++ b/src/main/java/de/marhali/easyi18n/dialog/descriptor/DeleteActionDescriptor.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.dialog.descriptor; +package de.marhali.easyi18n.dialog.descriptor; import com.intellij.openapi.ui.DialogBuilder; import com.intellij.openapi.ui.DialogWrapper; diff --git a/src/main/java/de/marhali/easyi18n/ui/editor/I18nCompletionContributor.java b/src/main/java/de/marhali/easyi18n/editor/I18nCompletionContributor.java similarity index 93% rename from src/main/java/de/marhali/easyi18n/ui/editor/I18nCompletionContributor.java rename to src/main/java/de/marhali/easyi18n/editor/I18nCompletionContributor.java index fce0ae2..b47fa62 100644 --- a/src/main/java/de/marhali/easyi18n/ui/editor/I18nCompletionContributor.java +++ b/src/main/java/de/marhali/easyi18n/editor/I18nCompletionContributor.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.editor; +package de.marhali.easyi18n.editor; import com.intellij.codeInsight.completion.CompletionContributor; import com.intellij.codeInsight.completion.CompletionType; diff --git a/src/main/java/de/marhali/easyi18n/ui/editor/I18nCompletionProvider.java b/src/main/java/de/marhali/easyi18n/editor/I18nCompletionProvider.java similarity index 98% rename from src/main/java/de/marhali/easyi18n/ui/editor/I18nCompletionProvider.java rename to src/main/java/de/marhali/easyi18n/editor/I18nCompletionProvider.java index bc77b00..0afcf5c 100644 --- a/src/main/java/de/marhali/easyi18n/ui/editor/I18nCompletionProvider.java +++ b/src/main/java/de/marhali/easyi18n/editor/I18nCompletionProvider.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.editor; +package de.marhali.easyi18n.editor; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.codeInsight.completion.CompletionProvider; diff --git a/src/main/java/de/marhali/easyi18n/ui/editor/I18nKeyAnnotator.java b/src/main/java/de/marhali/easyi18n/editor/I18nKeyAnnotator.java similarity index 97% rename from src/main/java/de/marhali/easyi18n/ui/editor/I18nKeyAnnotator.java rename to src/main/java/de/marhali/easyi18n/editor/I18nKeyAnnotator.java index 481288e..a79504e 100644 --- a/src/main/java/de/marhali/easyi18n/ui/editor/I18nKeyAnnotator.java +++ b/src/main/java/de/marhali/easyi18n/editor/I18nKeyAnnotator.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.editor; +package de.marhali.easyi18n.editor; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.Annotator; diff --git a/src/main/java/de/marhali/easyi18n/ui/listener/DeleteKeyListener.java b/src/main/java/de/marhali/easyi18n/listener/DeleteKeyListener.java similarity index 93% rename from src/main/java/de/marhali/easyi18n/ui/listener/DeleteKeyListener.java rename to src/main/java/de/marhali/easyi18n/listener/DeleteKeyListener.java index 283976d..2c45b1f 100644 --- a/src/main/java/de/marhali/easyi18n/ui/listener/DeleteKeyListener.java +++ b/src/main/java/de/marhali/easyi18n/listener/DeleteKeyListener.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.listener; +package de.marhali.easyi18n.listener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; diff --git a/src/main/java/de/marhali/easyi18n/ui/listener/PopupClickListener.java b/src/main/java/de/marhali/easyi18n/listener/PopupClickListener.java similarity index 95% rename from src/main/java/de/marhali/easyi18n/ui/listener/PopupClickListener.java rename to src/main/java/de/marhali/easyi18n/listener/PopupClickListener.java index 4d2845f..585b39d 100644 --- a/src/main/java/de/marhali/easyi18n/ui/listener/PopupClickListener.java +++ b/src/main/java/de/marhali/easyi18n/listener/PopupClickListener.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.listener; +package de.marhali.easyi18n.listener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; diff --git a/src/main/java/de/marhali/easyi18n/ui/renderer/TableRenderer.java b/src/main/java/de/marhali/easyi18n/renderer/TableRenderer.java similarity index 96% rename from src/main/java/de/marhali/easyi18n/ui/renderer/TableRenderer.java rename to src/main/java/de/marhali/easyi18n/renderer/TableRenderer.java index 18aeab4..cebe4c9 100644 --- a/src/main/java/de/marhali/easyi18n/ui/renderer/TableRenderer.java +++ b/src/main/java/de/marhali/easyi18n/renderer/TableRenderer.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.renderer; +package de.marhali.easyi18n.renderer; import com.intellij.ui.JBColor; diff --git a/src/main/java/de/marhali/easyi18n/ui/renderer/TreeRenderer.java b/src/main/java/de/marhali/easyi18n/renderer/TreeRenderer.java similarity index 86% rename from src/main/java/de/marhali/easyi18n/ui/renderer/TreeRenderer.java rename to src/main/java/de/marhali/easyi18n/renderer/TreeRenderer.java index b8ae3c5..f643dd7 100644 --- a/src/main/java/de/marhali/easyi18n/ui/renderer/TreeRenderer.java +++ b/src/main/java/de/marhali/easyi18n/renderer/TreeRenderer.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.renderer; +package de.marhali.easyi18n.renderer; import com.intellij.ide.util.treeView.NodeRenderer; import com.intellij.navigation.ItemPresentation; @@ -7,9 +7,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeCellRenderer; -import java.awt.*; /** * Similar to {@link NodeRenderer} but will will override {@link #getPresentation(Object)} to diff --git a/src/main/java/de/marhali/easyi18n/service/WindowManager.java b/src/main/java/de/marhali/easyi18n/service/WindowManager.java index cf4d632..c92883e 100644 --- a/src/main/java/de/marhali/easyi18n/service/WindowManager.java +++ b/src/main/java/de/marhali/easyi18n/service/WindowManager.java @@ -2,8 +2,8 @@ package de.marhali.easyi18n.service; import com.intellij.openapi.wm.ToolWindow; -import de.marhali.easyi18n.ui.tabs.TableView; -import de.marhali.easyi18n.ui.tabs.TreeView; +import de.marhali.easyi18n.tabs.TableView; +import de.marhali.easyi18n.tabs.TreeView; public class WindowManager { diff --git a/src/main/java/de/marhali/easyi18n/ui/tabs/TableView.form b/src/main/java/de/marhali/easyi18n/tabs/TableView.form similarity index 93% rename from src/main/java/de/marhali/easyi18n/ui/tabs/TableView.form rename to src/main/java/de/marhali/easyi18n/tabs/TableView.form index e88ccbb..51d35af 100644 --- a/src/main/java/de/marhali/easyi18n/ui/tabs/TableView.form +++ b/src/main/java/de/marhali/easyi18n/tabs/TableView.form @@ -1,5 +1,5 @@ -
+ diff --git a/src/main/java/de/marhali/easyi18n/ui/tabs/TableView.java b/src/main/java/de/marhali/easyi18n/tabs/TableView.java similarity index 92% rename from src/main/java/de/marhali/easyi18n/ui/tabs/TableView.java rename to src/main/java/de/marhali/easyi18n/tabs/TableView.java index 5e81cc1..4b7dc31 100644 --- a/src/main/java/de/marhali/easyi18n/ui/tabs/TableView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TableView.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.tabs; +package de.marhali.easyi18n.tabs; import com.intellij.openapi.project.Project; import com.intellij.ui.components.JBScrollPane; @@ -11,10 +11,10 @@ import de.marhali.easyi18n.model.Translations; import de.marhali.easyi18n.model.KeyedTranslation; import de.marhali.easyi18n.model.TranslationDelete; import de.marhali.easyi18n.model.table.TableModelTranslator; -import de.marhali.easyi18n.ui.dialog.EditDialog; -import de.marhali.easyi18n.ui.listener.DeleteKeyListener; -import de.marhali.easyi18n.ui.listener.PopupClickListener; -import de.marhali.easyi18n.ui.renderer.TableRenderer; +import de.marhali.easyi18n.dialog.EditDialog; +import de.marhali.easyi18n.listener.DeleteKeyListener; +import de.marhali.easyi18n.listener.PopupClickListener; +import de.marhali.easyi18n.renderer.TableRenderer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.form b/src/main/java/de/marhali/easyi18n/tabs/TreeView.form similarity index 94% rename from src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.form rename to src/main/java/de/marhali/easyi18n/tabs/TreeView.form index de99827..053a09b 100644 --- a/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.form +++ b/src/main/java/de/marhali/easyi18n/tabs/TreeView.form @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.java b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java similarity index 90% rename from src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.java rename to src/main/java/de/marhali/easyi18n/tabs/TreeView.java index a4b77cd..069f975 100644 --- a/src/main/java/de/marhali/easyi18n/ui/tabs/TreeView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n.ui.tabs; +package de.marhali.easyi18n.tabs; import com.intellij.ide.projectView.PresentationData; import com.intellij.openapi.actionSystem.ActionManager; @@ -14,13 +14,12 @@ import de.marhali.easyi18n.model.Translations; import de.marhali.easyi18n.model.KeyedTranslation; import de.marhali.easyi18n.model.TranslationDelete; import de.marhali.easyi18n.model.tree.TreeModelTranslator; -import de.marhali.easyi18n.ui.action.treeview.CollapseTreeViewAction; -import de.marhali.easyi18n.ui.action.treeview.ExpandTreeViewAction; -import de.marhali.easyi18n.ui.dialog.EditDialog; -import de.marhali.easyi18n.ui.listener.DeleteKeyListener; -import de.marhali.easyi18n.ui.listener.PopupClickListener; -import de.marhali.easyi18n.ui.renderer.TreeRenderer; -import de.marhali.easyi18n.util.TranslationsUtil; +import de.marhali.easyi18n.action.treeview.CollapseTreeViewAction; +import de.marhali.easyi18n.action.treeview.ExpandTreeViewAction; +import de.marhali.easyi18n.dialog.EditDialog; +import de.marhali.easyi18n.listener.DeleteKeyListener; +import de.marhali.easyi18n.listener.PopupClickListener; +import de.marhali.easyi18n.renderer.TreeRenderer; import de.marhali.easyi18n.util.TreeUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index d8180e3..d1d2292 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -14,8 +14,8 @@ + implementationClass="de.marhali.easyi18n.editor.I18nCompletionContributor" /> - + \ No newline at end of file