Merge pull request #80 from google/proguard-integ

Proguard integ
google · Apr 16, 2016 · b71466e · b71466e
2 parents ca334f8 + 5360e57
commit b71466e
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/ClassySharkWS/src/com/google/classyshark/gui/panel/toolbar/Toolbar.java b/ClassySharkWS/src/com/google/classyshark/gui/panel/toolbar/Toolbar.java
@@ -52,7 +52,7 @@ public Toolbar(final ToolbarController toolbarController) {
         openBtn = buildOpenButton();
         backBtn = buildBackButton();
         viewBtn = buildViewButton();
-        //mappingBtn = buildMappingsButton();
+        mappingBtn = buildMappingsButton();
         exportButton = buildExportButton();
         recentArchivesBtn = buildRecentArchivesButton();
         leftPanelToggleBtn = buildLeftPanelToggleButton();
@@ -62,7 +62,7 @@ public Toolbar(final ToolbarController toolbarController) {
         add(backBtn);
         add(viewBtn);
         add(typingArea);
-        //add(mappingBtn);
+        add(mappingBtn);
         add(exportButton);
         add(recentArchivesBtn);
 
@@ -199,11 +199,10 @@ public void actionPerformed(ActionEvent e) {
         return result;
     }
 
-    /*
     private JButton buildMappingsButton() {
 
-        JButton result = new JButton("#");
-        result.setFont(new Font("Menlo", Font.PLAIN, 18));
+        JButton result =
+                new JButton(new ImageIcon(getClass().getResource(IconSchemes.EXPORT_ICON_PATH)));
 
         result.addActionListener(new ActionListener() {
             @Override
@@ -212,15 +211,12 @@ public void actionPerformed(ActionEvent e) {
             }
         });
 
-        result.setToolTipText("Export");
+        result.setToolTipText("Mappings");
         result.setBorderPainted(false);
-        result.setForeground(ColorScheme.FOREGROUND_YELLOW);
-        result.setBackground(ColorScheme.BLACK);
         result.setEnabled(true);
 
         return result;
     }
-    */
 
     private JButton buildRecentArchivesButton() {
         RecentArchivesButton result = new RecentArchivesButton();