Revert "Solving #592 - there is only one button for creating DPU temp…

…lates" This reverts commit d51786b.
UnifiedViews · Oct 17, 2016 · cb0169e · cb0169e
1 parent aca4b05
commit cb0169e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 34 deletions.
diff --git a/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/components/DPUTree.java b/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/components/DPUTree.java
@@ -88,16 +88,6 @@ public class DPUTree extends CustomComponent {
 
     private boolean isValid = true;
 
-    public boolean isShowButtonCreateTemplate() {
-        return showButtonCreateTemplate;
-    }
-
-    public void setShowButtonCreateTemplate(boolean showButtonCreateTemplate) {
-        this.showButtonCreateTemplate = showButtonCreateTemplate;
-    }
-
-    private boolean showButtonCreateTemplate = true;
-
     /**
      * Creates new DPUTree.
      */
@@ -195,30 +185,28 @@ public void buttonClick(Button.ClickEvent event) {
         topLine.setVisible(isExpandable);
         mainLayout.addComponent(topLine);
 
-        if (showButtonCreateTemplate) {
-            buttonCreateDPU = new Button();
-            buttonCreateDPU.setCaption(Messages.getString("DPUTree.create.dpu"));
-            buttonCreateDPU.setHeight("25px");
-            buttonCreateDPU.setWidth("180px");
-            buttonCreateDPU
-                    .addClickListener(new Button.ClickListener() {
-                        private static final long serialVersionUID = 1L;
-
-                        @Override
-                        public void buttonClick(Button.ClickEvent event) {
-                            //Open the dialog for DPU Template creation
-                            if (!UI.getCurrent().getWindows().contains(createDPU)) {
-                                createDPU.initClean();
-                                UI.getCurrent().addWindow(createDPU);
-                                createDPU.removeCloseListener(createDPUCloseListener);
-                                createDPU.addCloseListener(createDPUCloseListener);
-                            } else {
-                                createDPU.bringToFront();
-                            }
-
+        buttonCreateDPU = new Button();
+        buttonCreateDPU.setCaption(Messages.getString("DPUTree.create.dpu"));
+        buttonCreateDPU.setHeight("25px");
+        buttonCreateDPU.setWidth("180px");
+        buttonCreateDPU
+                .addClickListener(new Button.ClickListener() {
+                    private static final long serialVersionUID = 1L;
+
+                    @Override
+                    public void buttonClick(Button.ClickEvent event) {
+                        //Open the dialog for DPU Template creation
+                        if (!UI.getCurrent().getWindows().contains(createDPU)) {
+                            createDPU.initClean();
+                            UI.getCurrent().addWindow(createDPU);
+                            createDPU.removeCloseListener(createDPUCloseListener);
+                            createDPU.addCloseListener(createDPUCloseListener);
+                        } else {
+                            createDPU.bringToFront();
                         }
-                    });
-        }
+
+                    }
+                });
 
         exportButton = new Button(Messages.getString("DPUTree.export.dpu"));
         exportButton.setHeight("25px");

diff --git a/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/views/dpu/DPUViewImpl.java b/frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/views/dpu/DPUViewImpl.java
@@ -241,7 +241,6 @@ private HorizontalLayout buildDpuLayout() {
 
         //DPU Template Tree
         dpuTree.setExpandable(false);
-        dpuTree.setShowButtonCreateTemplate(false);
         dpuTree.fillTree();
         if (dpuTree.getListeners(ItemClickEvent.class).isEmpty()) {
             dpuTree.addItemClickListener(new ItemClickEvent.ItemClickListener() {