move ui packages into root folder

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.action.*;
-import de.marhali.easyi18n.ui.tabs.TableView;
+import de.marhali.easyi18n.tabs.TableView;
-import de.marhali.easyi18n.ui.tabs.TreeView;
+import de.marhali.easyi18n.tabs.TreeView;
 
 import org.jetbrains.annotations.NotNull;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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

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.tabs.TableView;
-import de.marhali.easyi18n.ui.tabs.TreeView;
+import de.marhali.easyi18n.tabs.TreeView;
 
 public class WindowManager {
 

src/main/java/de/marhali/easyi18n/tabs/TableView.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.marhali.easyi18n.ui.tabs.TableView">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.marhali.easyi18n.tabs.TableView">
   <grid id="27dc6" binding="rootPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

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.dialog.EditDialog;
-import de.marhali.easyi18n.ui.listener.DeleteKeyListener;
+import de.marhali.easyi18n.listener.DeleteKeyListener;
-import de.marhali.easyi18n.ui.listener.PopupClickListener;
+import de.marhali.easyi18n.listener.PopupClickListener;
-import de.marhali.easyi18n.ui.renderer.TableRenderer;
+import de.marhali.easyi18n.renderer.TableRenderer;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

src/main/java/de/marhali/easyi18n/tabs/TreeView.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.marhali.easyi18n.ui.tabs.TreeView">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.marhali.easyi18n.tabs.TreeView">
   <grid id="27dc6" binding="rootPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>

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.action.treeview.CollapseTreeViewAction;
-import de.marhali.easyi18n.ui.action.treeview.ExpandTreeViewAction;
+import de.marhali.easyi18n.action.treeview.ExpandTreeViewAction;
-import de.marhali.easyi18n.ui.dialog.EditDialog;
+import de.marhali.easyi18n.dialog.EditDialog;
-import de.marhali.easyi18n.ui.listener.DeleteKeyListener;
+import de.marhali.easyi18n.listener.DeleteKeyListener;
-import de.marhali.easyi18n.ui.listener.PopupClickListener;
+import de.marhali.easyi18n.listener.PopupClickListener;
-import de.marhali.easyi18n.ui.renderer.TreeRenderer;
+import de.marhali.easyi18n.renderer.TreeRenderer;
-import de.marhali.easyi18n.util.TranslationsUtil;
 import de.marhali.easyi18n.util.TreeUtil;
 
 import org.jetbrains.annotations.NotNull;

src/main/resources/META-INF/plugin.xml

@@ -14,8 +14,8 @@
         <projectService serviceImplementation="de.marhali.easyi18n.service.SettingsService" />
 
         <completion.contributor language="any"
-                                implementationClass="de.marhali.easyi18n.ui.editor.I18nCompletionContributor" />
+                                implementationClass="de.marhali.easyi18n.editor.I18nCompletionContributor" />
 
-        <annotator language="" implementationClass="de.marhali.easyi18n.ui.editor.I18nKeyAnnotator" />
+        <annotator language="" implementationClass="de.marhali.easyi18n.editor.I18nKeyAnnotator" />
     </extensions>
 </idea-plugin>