Cleanup to merge #130

TheThirdOne · Sep 25, 2021 · f54a2dc · f54a2dc
1 parent cacf017
commit f54a2dc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/src/rars/venus/MainPane.java b/src/rars/venus/MainPane.java
@@ -70,22 +70,14 @@ public MainPane(VenusUI appFrame, Editor editor, RegistersWindow regs,
         editTabbedPane = new EditTabbedPane(appFrame, editor, this);
         executeTab = new ExecutePane(appFrame, regs, cop1Regs, cop0Regs);
         String editTabTitle = "Edit";
-        //String editTabTitle = "<html><center><p>Edit</p></center></html>";
-        //"<html><center>&nbsp;<br>E<br>d<br>i<br>t<br>&nbsp;</center></html>";
         String executeTabTitle = "Execute"; //"<html><center>&nbsp;<br>E<br>x<br>e<br>c<br>u<br>t<br>e<br>&nbsp;</center></html>";
-        //String executeTabTitle = "<html><center><p>Execute</p></center></html>";
         Icon editTabIcon = null;//new ImageIcon(Toolkit.getDefaultToolkit().getImage(this.getClass().getResource(Globals.imagesPath+"Edit_tab.jpg")));
         Icon executeTabIcon = null;//new ImageIcon(Toolkit.getDefaultToolkit().getImage(this.getClass().getResource(Globals.imagesPath+"Execute_tab.jpg")));
 
         this.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
         this.addTab(editTabTitle, editTabIcon, editTabbedPane);
         this.setForeground(Color.black);
 
-        // this.addTab("<html><center>&nbsp;<br>P<br>r<br>o<br>j<br>&nbsp;<br>1<br&nbsp;</center></html>", null, new JTabbedPane());
-        // this.addTab("<html><center>&nbsp;<br>P<br>r<br>o<br>j<br>&nbsp;<br>2<br&nbsp;</center></html>", null, new JTabbedPane());
-        // this.addTab("<html><center>&nbsp;<br>P<br>r<br>o<br>j<br>&nbsp;<br>3<br&nbsp;</center></html>", null, new JTabbedPane());
-        // this.addTab("<html><center>&nbsp;<br>P<br>r<br>o<br>j<br>&nbsp;<br>4<br&nbsp;</center></html>", null, new JTabbedPane());
-
         this.addTab(executeTabTitle, executeTabIcon, executeTab);
 
         this.setToolTipTextAt(0, "Text editor for composing RISCV programs.");
@@ -150,4 +142,4 @@ public ExecutePane getExecuteTab() {
         return executeTab;
     }
 
-}
+}
diff --git a/src/rars/venus/MessagesPane.java b/src/rars/venus/MessagesPane.java
@@ -171,11 +171,6 @@ public void actionPerformed(ActionEvent e) {
         runTab.add(new JScrollPane(run, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
                 ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED), BorderLayout.CENTER);
 
-        /* Bad HTML fix
-        this.addTab("<html><center><p>Messages</p></center></html>", assembleTab);
-        this.addTab("<html><center><p>Run I/O</p></center></html>", runTab);
-        */
-
         this.addTab("Messages", assembleTab);
         this.addTab("Run I/O", runTab);
         this.setForeground(Color.BLACK);

diff --git a/src/rars/venus/registers/RegistersPane.java b/src/rars/venus/registers/RegistersPane.java
@@ -63,13 +63,6 @@ public RegistersPane(VenusUI appFrame, RegistersWindow regs, FloatingPointWindow
         fpTab.setVisible(true);
         csrTab.setVisible(true);
 
-        /* Bad HTML Fix
-        this.addTab("<html><center><p>Registers</p></center></html>", regsTab);
-        this.addTab("<html><center><p>Floating Point</p></center></html>", fpTab);
-        this.addTab("<html><center><p>Control and Status</p></center></html>", csrTab);
-        */
-
-        // Good code fix
         this.addTab("Registers", regsTab);
         this.addTab("Floating Point", fpTab);
         this.addTab("Control and Status", csrTab);
@@ -106,4 +99,4 @@ public FloatingPointWindow getFloatingPointWindow() {
     public ControlAndStatusWindow getControlAndStatusWindow() {
         return csrTab;
     }
-}
+}