--- MainFrame.java	Sun Nov 10 15:37:11 2002
+++ /home/scribe/jbproject/untitled4/src/untitled4/Frame1.java	Sun Nov 10 01:09:37 2002
@@ -1,4 +1,4 @@
-package modedit;
+package untitled4;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -19,44 +19,44 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-public class MainFrame extends JFrame {
+public class Frame1 extends JFrame {
 	JPanel contentPane;
-	BorderLayout contentPaneLayout = new BorderLayout();
-	JPanel rightPanel = new JPanel();
-	JPanel leftPanel = new JPanel();
-	JPanel currentTagPanel = new JPanel();
-	JPanel textPanel = new JPanel();
-	BorderLayout leftPanelLayout = new BorderLayout();
-	JEditorPane translatedTextEditor = new JEditorPane() {
+	BorderLayout borderLayout1 = new BorderLayout();
+	JPanel jPanel3 = new JPanel();
+	JPanel jPanel4 = new JPanel();
+	JPanel jPanel5 = new JPanel();
+	JPanel jPanel6 = new JPanel();
+	BorderLayout borderLayout2 = new BorderLayout();
+	JEditorPane jEditorPane1 = new JEditorPane() {
 		public boolean isManagingFocus() { return true; }
 	};
-	GridLayout textPanelLayout = new GridLayout();
-	JTextArea greekTextEditor = new JTextArea() {
+	GridLayout gridLayout1 = new GridLayout();
+	JTextArea jEditorPane2 = new JTextArea() {
 		public boolean isManagingFocus() { return true; }
 	};
-	JPanel signSavePanel = new JPanel();
-	JPanel tagPanel = new JPanel();
-	BorderLayout currentTagPanelLayout = new BorderLayout();
-	JLabel currentTagLabel = new JLabel();
-	GridLayout tagPanelLayout = new GridLayout();
-	JTextField currentTagText = new JTextField();
-	JPanel currentActionPanel = new JPanel();
-	JLabel currentActionLabel = new JLabel();
-	JLabel actionLabel = new JLabel();
-	JButton signSaveButton = new JButton();
-	JButton guessTagButton = new JButton();
-	JPanel loginPanel = new JPanel();
-	JLabel userIDLabel = new JLabel();
+	JPanel jPanel1 = new JPanel();
+	JPanel jPanel2 = new JPanel();
+	BorderLayout borderLayout3 = new BorderLayout();
+	JLabel jLabel1 = new JLabel();
+	GridLayout gridLayout2 = new GridLayout();
+	JTextField jTextField1 = new JTextField();
+	JPanel jPanel7 = new JPanel();
+	JLabel jLabel2 = new JLabel();
+	JLabel jLabel3 = new JLabel();
+	JButton jButton1 = new JButton();
+	JButton jButton2 = new JButton();
+	JPanel jPanel8 = new JPanel();
+	JLabel jLabel4 = new JLabel();
 	JTextField userIDText = new JTextField();
-	JButton loginButton = new JButton();
+	JButton jButton4 = new JButton();
 	JLabel loginStatusLabel = new JLabel();
-	GridLayout loginPanelLayout = new GridLayout();
-	BorderLayout rightPanelLayout = new BorderLayout();
+	GridLayout gridLayout3 = new GridLayout();
+	BorderLayout borderLayout4 = new BorderLayout();
 	int currentCaret = -1;
 	Object greekHighlight;
 
 	/**Construct the frame*/
-	public MainFrame() {
+	public Frame1() {
 		enableEvents(AWTEvent.WINDOW_EVENT_MASK);
 		try {
 			jbInit();
@@ -66,33 +66,36 @@
 		}
 	}
 
-	private JEditorPane strongTextEditor = new JEditorPane();
-	private TitledBorder translatedTextEditorBorder;
-	private TitledBorder greekTextEditorBorder;
-	private TitledBorder strongTextEditorBorder;
+
+	private JEditorPane jEditorPane3 = new JEditorPane();
+	private TitledBorder titledBorder1;
+	private TitledBorder titledBorder2;
+	private TitledBorder titledBorder3;
+	private TitledBorder titledBorder4;
+	private TitledBorder titledBorder5;
 	private Hashtable tags = new Hashtable();
-	private JScrollPane strongTextScroll = new JScrollPane();
-	private JScrollPane translatedTextScroll = new JScrollPane();
-	private JScrollPane greekTextScroll = new JScrollPane();
-	private JPanel aPanel = new JPanel();
-	private JPanel currentVersePanel = new JPanel();
-	private BorderLayout aPanelLayout = new BorderLayout();
-	private JLabel currentVerseLabel = new JLabel();
-	private JTextField currentVerseText = new JTextField();
-	private GridLayout currentVersePanelLayout = new GridLayout();
-	private JButton loadVerseButton = new JButton();
-	private TitledBorder currentVersePanelBorder;
-	private TitledBorder loginPanelBorder;
-	private JPanel bPanel = new JPanel();
-	private JPanel strongPanel = new JPanel();
+	private JScrollPane jScrollPane1 = new JScrollPane();
+	private JScrollPane jScrollPane2 = new JScrollPane();
+	private JScrollPane jScrollPane3 = new JScrollPane();
+	private JPanel jPanel9 = new JPanel();
+	private JPanel jPanel10 = new JPanel();
+	private BorderLayout borderLayout5 = new BorderLayout();
+	private JLabel jLabel6 = new JLabel();
+	private JTextField jTextField3 = new JTextField();
+	private GridLayout gridLayout4 = new GridLayout();
+	private JButton jButton5 = new JButton();
+	private TitledBorder titledBorder6;
+	private TitledBorder titledBorder7;
+	private JPanel jPanel11 = new JPanel();
+	private JPanel jPanel12 = new JPanel();
 	private JTextField wordText = new JTextField();
-	private GridLayout strongPanelLayout = new GridLayout();
+	private GridLayout gridLayout5 = new GridLayout();
 	private JTextField morphText = new JTextField();
 	private JTextField strongText = new JTextField();
-	private BorderLayout bPanelLayout = new BorderLayout();
-	private GridLayout signSavePanelLayout = new GridLayout();
-	private TitledBorder signSavePanelBorder;
-	private JPanel cPanel = new JPanel();
+	private BorderLayout borderLayout6 = new BorderLayout();
+	private GridLayout gridLayout6 = new GridLayout();
+	private TitledBorder titledBorder8;
+	private JPanel jPanel13 = new JPanel();
 
 	boolean localTR = false;
 	boolean localKJV = false;
@@ -111,165 +114,163 @@
 
 	private String userID = null;
 
-    private String proxyHost = null;
-    private String proxyPort = null;
-    private boolean useProxy = false;
-
 	public String currentKey = null;
-	private JPanel currentRangePanel = new JPanel();
-	private JLabel currentRangeLabel = new JLabel();
+	private JPanel jPanel14 = new JPanel();
+	private JLabel jLabel7 = new JLabel();
 	private JTextField rangeText = new JTextField();
-	private GridLayout currentRangePanelLayout = new GridLayout();
-	private BorderLayout cPanelLayout = new BorderLayout();
-	private TitledBorder currentRangePanelBorder;
-	private JButton exportRangeButton = new JButton();
-	private TitledBorder leftPanelBorder;
+	private GridLayout gridLayout7 = new GridLayout();
+	private BorderLayout borderLayout7 = new BorderLayout();
+	private TitledBorder titledBorder9;
+	private JButton jButton3 = new JButton();
+	private TitledBorder titledBorder10;
 
 	/**Component initialization*/
 	private void jbInit() throws Exception  {
-		//setIconImage(Toolkit.getDefaultToolkit().createImage(MainFrame.class.getResource("[Your Icon]")));
+		//setIconImage(Toolkit.getDefaultToolkit().createImage(Frame1.class.getResource("[Your Icon]")));
 		contentPane = (JPanel) this.getContentPane();
 
 		HTMLEditorKit htmlKit = new HTMLEditorKit();
-		currentVersePanelBorder = new TitledBorder("");
-		loginPanelBorder = new TitledBorder("");
-		signSavePanelBorder = new TitledBorder("");
-		currentRangePanelBorder = new TitledBorder("");
-		leftPanelBorder = new TitledBorder("");
-		translatedTextEditor.setEditable(false);
-		translatedTextEditor.setEditorKit(htmlKit);
-		translatedTextEditor.addKeyListener(new java.awt.event.KeyAdapter() {
+		titledBorder6 = new TitledBorder("");
+		titledBorder7 = new TitledBorder("");
+		titledBorder8 = new TitledBorder("");
+		titledBorder9 = new TitledBorder("");
+		titledBorder10 = new TitledBorder("");
+		jEditorPane1.setEditable(false);
+		jEditorPane1.setEditorKit(htmlKit);
+		jEditorPane1.addKeyListener(new java.awt.event.KeyAdapter() {
 			public void keyPressed(KeyEvent e) {
-				translatedTextEditor_keyPressed(e);
+				jEditorPane1_keyPressed(e);
 			}
 		});
 
 		HTMLEditorKit htmlKit3 = new HTMLEditorKit();
-		strongTextEditor.setEditable(false);
-		strongTextEditor.setEditorKit(htmlKit3);
+		jEditorPane3.setEditable(false);
+		jEditorPane3.setEditorKit(htmlKit3);
 
 		HTMLEditorKit htmlKit2 = new HTMLEditorKit();
-		greekTextEditor.setLineWrap(true);
-		greekTextEditor.setEditable(false);
-		greekTextEditor.setWrapStyleWord(true);
-		greekTextEditor.addKeyListener(new MainFrame_greekTextEditor_keyAdapter(this));
-		greekTextEditor.addMouseListener(new MainFrame_greekTextEditor_mouseAdapter(this));
-//		greekTextEditor.setEditorKit(htmlKit2);
-
-		translatedTextEditorBorder = new TitledBorder("");
-		greekTextEditorBorder = new TitledBorder("");
-		strongTextEditorBorder = new TitledBorder("");
-		translatedTextEditor.setBorder(translatedTextEditorBorder);
-		translatedTextEditor.addKeyListener(new MainFrame_translatedTextEditor_keyAdapter(this));
-		translatedTextEditor.addMouseMotionListener(new MainFrame_translatedTextEditor_mouseMotionAdapter(this));
-		translatedTextEditor.addMouseListener(new MainFrame_translatedTextEditor_mouseAdapter(this));
-		translatedTextEditor.addHyperlinkListener(new Hyperactive());
-		HTMLDocument doc = (HTMLDocument)translatedTextEditor.getDocument();
+		jEditorPane2.setLineWrap(true);
+		jEditorPane2.setEditable(false);
+		jEditorPane2.setWrapStyleWord(true);
+		jEditorPane2.addKeyListener(new Frame1_jEditorPane2_keyAdapter(this));
+		jEditorPane2.addMouseListener(new Frame1_jEditorPane2_mouseAdapter(this));
+//		jEditorPane2.setEditorKit(htmlKit2);
+
+		titledBorder1 = new TitledBorder("");
+		titledBorder2 = new TitledBorder("");
+		titledBorder3 = new TitledBorder("");
+		titledBorder4 = new TitledBorder("");
+		titledBorder5 = new TitledBorder("");
+		jEditorPane1.setBorder(titledBorder3);
+		jEditorPane1.addKeyListener(new Frame1_jEditorPane1_keyAdapter(this));
+		jEditorPane1.addMouseMotionListener(new Frame1_jEditorPane1_mouseMotionAdapter(this));
+		jEditorPane1.addMouseListener(new Frame1_jEditorPane1_mouseAdapter(this));
+		jEditorPane1.addHyperlinkListener(new Hyperactive());
+		HTMLDocument doc = (HTMLDocument)jEditorPane1.getDocument();
 		doc.setPreservesUnknownTags(true);
 
-		contentPane.setLayout(contentPaneLayout);
+		contentPane.setLayout(borderLayout1);
 		this.setSize(new Dimension(587, 564));
-		this.setTitle("Module Editor");
-		this.addKeyListener(new MainFrame_this_keyAdapter(this));
-		leftPanel.setLayout(leftPanelLayout);
-		textPanelLayout.setRows(3);
-		textPanelLayout.setColumns(1);
-		textPanel.setLayout(textPanelLayout);
-		greekTextEditor.setBorder(greekTextEditorBorder);
-		currentTagPanel.setLayout(currentTagPanelLayout);
-		currentTagLabel.setText("Current Tag");
-		tagPanel.setLayout(tagPanelLayout);
-		currentTagText.setText("0");
-		currentActionLabel.setText("Current Action:");
-		actionLabel.setText("[none]");
-		signSaveButton.setText("Sign & Save");
-		signSaveButton.addActionListener(new MainFrame_signSaveButton_actionAdapter(this));
-		guessTagButton.setText("Guess at all tags");
-		guessTagButton.addActionListener(new MainFrame_guessTagButton_actionAdapter(this));
-		rightPanel.setLayout(rightPanelLayout);
-		userIDLabel.setText("UserID");
-		loginButton.setText("Login");
-		loginButton.addActionListener(new MainFrame_loginButton_actionAdapter(this));
+		this.setTitle("Frame Title");
+		this.addKeyListener(new Frame1_this_keyAdapter(this));
+		jPanel4.setLayout(borderLayout2);
+		gridLayout1.setRows(3);
+		gridLayout1.setColumns(1);
+		jPanel6.setLayout(gridLayout1);
+		jEditorPane2.setBorder(titledBorder4);
+		jPanel5.setLayout(borderLayout3);
+		jLabel1.setText("Current Tag");
+		jPanel2.setLayout(gridLayout2);
+		jTextField1.setText("0");
+		jLabel2.setText("Current Action:");
+		jLabel3.setText("[none]");
+		jButton1.setText("Sign & Save");
+		jButton1.addActionListener(new Frame1_jButton1_actionAdapter(this));
+		jButton2.setText("Guess at all tags");
+		jButton2.addActionListener(new Frame1_jButton2_actionAdapter(this));
+		jPanel3.setLayout(borderLayout4);
+		jLabel4.setText("UserID");
+		jButton4.setText("Login");
+		jButton4.addActionListener(new Frame1_jButton4_actionAdapter(this));
 		loginStatusLabel.setBorder(BorderFactory.createLineBorder(Color.black));
 		loginStatusLabel.setText("Not Logged In");
-		loginPanel.setLayout(loginPanelLayout);
-		strongTextEditor.setBorder(strongTextEditorBorder);
-		rightPanel.setBorder(BorderFactory.createEtchedBorder());
-		loginPanel.setBorder(loginPanelBorder);
-		greekTextScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		translatedTextScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		aPanel.setLayout(aPanelLayout);
-		currentVerseLabel.setText("Current Verse");
-		currentVersePanel.setLayout(currentVersePanelLayout);
-		currentVersePanelLayout.setColumns(1);
-		currentVersePanelLayout.setRows(0);
-		loadVerseButton.setText("Load");
-		loadVerseButton.addActionListener(new MainFrame_loadVerseButton_actionAdapter(this));
-		currentVersePanel.setBorder(currentVersePanelBorder);
-		currentVerseText.addKeyListener(new MainFrame_currentVerseText_keyAdapter(this));
-		strongPanel.setLayout(strongPanelLayout);
-		strongPanelLayout.setColumns(1);
-		strongPanelLayout.setRows(0);
-		bPanel.setLayout(bPanelLayout);
-		signSavePanel.setLayout(signSavePanelLayout);
-		signSavePanelLayout.setColumns(1);
-		signSavePanelLayout.setRows(0);
-		signSavePanel.setBorder(signSavePanelBorder);
-		contentPane.addKeyListener(new MainFrame_contentPane_keyAdapter(this));
-		currentRangeLabel.setText("Current Range");
-		currentRangePanel.setLayout(currentRangePanelLayout);
-		cPanel.setLayout(cPanelLayout);
-		currentRangePanelLayout.setColumns(1);
-		currentRangePanelLayout.setRows(0);
-		currentRangePanel.setBorder(currentRangePanelBorder);
-		exportRangeButton.setText("Export");
-		exportRangeButton.addActionListener(new MainFrame_exportRangeButton_actionAdapter(this));
-		leftPanel.setBorder(leftPanelBorder);
-		contentPane.add(rightPanel, BorderLayout.EAST);
-		rightPanel.add(loginPanel, BorderLayout.NORTH);
-		loginPanel.add(userIDLabel, null);
-		loginPanel.add(userIDText, null);
-		loginPanel.add(loginButton, null);
-		loginPanel.add(loginStatusLabel, null);
-		rightPanel.add(aPanel, BorderLayout.CENTER);
-		aPanel.add(currentRangePanel, BorderLayout.NORTH);
-		currentVersePanel.add(currentVerseLabel, null);
-		currentVersePanel.add(currentVerseText, null);
-		currentVersePanel.add(loadVerseButton, null);
-		currentVersePanel.add(guessTagButton, null);
-		aPanel.add(bPanel,  BorderLayout.CENTER);
-		bPanel.add(signSavePanel,  BorderLayout.SOUTH);
-		strongPanel.add(wordText, null);
-		strongPanel.add(strongText, null);
-		strongPanel.add(morphText, null);
-		contentPane.add(leftPanel, BorderLayout.CENTER);
-		leftPanel.add(currentTagPanel, BorderLayout.SOUTH);
-		currentTagPanel.add(tagPanel, BorderLayout.WEST);
-		tagPanelLayout.setRows(3);
-		tagPanelLayout.setColumns(1);
-		loginPanelLayout.setRows(4);
-		loginPanelLayout.setColumns(1);
-		tagPanel.add(currentTagLabel, null);
-		tagPanel.add(currentTagText, null);
-		tagPanel.add(currentActionPanel, null);
-		currentActionPanel.add(currentActionLabel, null);
-		currentActionPanel.add(actionLabel, null);
-		currentTagPanel.add(strongPanel,  BorderLayout.CENTER);
-		signSavePanel.add(signSaveButton, null);
-		bPanel.add(cPanel, BorderLayout.CENTER);
-		cPanel.add(currentVersePanel, BorderLayout.NORTH);
-		currentRangePanel.add(currentRangeLabel, null);
-		currentRangePanel.add(rangeText, null);
-		currentRangePanel.add(exportRangeButton, null);
-		leftPanel.add(textPanel, BorderLayout.CENTER);
-		textPanel.add(translatedTextScroll, null);
-		translatedTextScroll.getViewport().add(translatedTextEditor, null);
-		textPanel.add(greekTextScroll, null);
-		greekTextScroll.getViewport().add(greekTextEditor, null);
-		textPanel.add(strongTextScroll, null);
-		strongTextScroll.getViewport().add(strongTextEditor, null);
+		jPanel8.setLayout(gridLayout3);
+		jEditorPane3.setBorder(titledBorder5);
+		jPanel3.setBorder(BorderFactory.createEtchedBorder());
+		jPanel8.setBorder(titledBorder7);
+		jScrollPane3.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		jScrollPane2.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		jPanel9.setLayout(borderLayout5);
+		jLabel6.setText("Current Verse");
+		jPanel10.setLayout(gridLayout4);
+		gridLayout4.setColumns(1);
+		gridLayout4.setRows(0);
+		jButton5.setText("Load");
+		jButton5.addActionListener(new Frame1_jButton5_actionAdapter(this));
+		jPanel10.setBorder(titledBorder6);
+		jTextField3.addKeyListener(new Frame1_jTextField3_keyAdapter(this));
+		jPanel12.setLayout(gridLayout5);
+		gridLayout5.setColumns(1);
+		gridLayout5.setRows(0);
+		jPanel11.setLayout(borderLayout6);
+		jPanel1.setLayout(gridLayout6);
+		gridLayout6.setColumns(1);
+		gridLayout6.setRows(0);
+		jPanel1.setBorder(titledBorder8);
+		contentPane.addKeyListener(new Frame1_contentPane_keyAdapter(this));
+		jLabel7.setText("Current Range");
+		jPanel14.setLayout(gridLayout7);
+		jPanel13.setLayout(borderLayout7);
+		gridLayout7.setColumns(1);
+		gridLayout7.setRows(0);
+		jPanel14.setBorder(titledBorder9);
+		jButton3.setText("Export");
+		jButton3.addActionListener(new Frame1_jButton3_actionAdapter(this));
+		jPanel4.setBorder(titledBorder10);
+		contentPane.add(jPanel3, BorderLayout.EAST);
+		jPanel3.add(jPanel8, BorderLayout.NORTH);
+		jPanel8.add(jLabel4, null);
+		jPanel8.add(userIDText, null);
+		jPanel8.add(jButton4, null);
+		jPanel8.add(loginStatusLabel, null);
+		jPanel3.add(jPanel9, BorderLayout.CENTER);
+		jPanel9.add(jPanel14, BorderLayout.NORTH);
+		jPanel10.add(jLabel6, null);
+		jPanel10.add(jTextField3, null);
+		jPanel10.add(jButton5, null);
+		jPanel10.add(jButton2, null);
+		jPanel9.add(jPanel11,  BorderLayout.CENTER);
+		jPanel11.add(jPanel1,  BorderLayout.SOUTH);
+		jPanel12.add(wordText, null);
+		jPanel12.add(strongText, null);
+		jPanel12.add(morphText, null);
+		contentPane.add(jPanel4, BorderLayout.CENTER);
+		jPanel4.add(jPanel5, BorderLayout.SOUTH);
+		jPanel5.add(jPanel2, BorderLayout.WEST);
+		gridLayout2.setRows(3);
+		gridLayout2.setColumns(1);
+		gridLayout3.setRows(4);
+		gridLayout3.setColumns(1);
+		jPanel2.add(jLabel1, null);
+		jPanel2.add(jTextField1, null);
+		jPanel2.add(jPanel7, null);
+		jPanel7.add(jLabel2, null);
+		jPanel7.add(jLabel3, null);
+		jPanel5.add(jPanel12,  BorderLayout.CENTER);
+		jPanel1.add(jButton1, null);
+		jPanel11.add(jPanel13, BorderLayout.CENTER);
+		jPanel13.add(jPanel10, BorderLayout.NORTH);
+		jPanel14.add(jLabel7, null);
+		jPanel14.add(rangeText, null);
+		jPanel14.add(jButton3, null);
+		jPanel4.add(jPanel6, BorderLayout.CENTER);
+		jPanel6.add(jScrollPane2, null);
+		jScrollPane2.getViewport().add(jEditorPane1, null);
+		jPanel6.add(jScrollPane3, null);
+		jScrollPane3.getViewport().add(jEditorPane2, null);
+		jPanel6.add(jScrollPane1, null);
+		jScrollPane1.getViewport().add(jEditorPane3, null);
 
-		Highlighter h = greekTextEditor.getHighlighter();
+		Highlighter h = jEditorPane2.getHighlighter();
 		DefaultHighlighter.DefaultHighlightPainter hp = new DefaultHighlighter.DefaultHighlightPainter(Color.yellow);
 		greekHighlight = h.addHighlight(0, 0, hp);
 
@@ -291,7 +292,7 @@
 		}
 	}
 
-	void signSaveButton_actionPerformed(ActionEvent e) {
+	void jButton1_actionPerformed(ActionEvent e) {
 
 		// assert we are ok to save something
 		if (currentKey == null) {
@@ -338,35 +339,12 @@
 
 		rangeText.setText(props.getProperty("currentRange", "jn"));
 		userIDText.setText(props.getProperty("userID", ""));
-
-        useProxy = (props.getProperty("useProxy", "false").equals("true"));
-        proxyHost = props.getProperty("proxyHost", "[none]");
-        proxyPort = props.getProperty("proxyPort", "8080");
-        //Show Proxy-Dialog if there is anything not local
-        if (!(localImages && localKJV &&localTR && localThayer)) {
-          ProxyDialog pd = new ProxyDialog(useProxy,proxyHost,proxyPort);
-          pd.validate();
-          pd.show();
-          if (pd.isOK()) {
-            String proxy; String port;
-            if ((proxy = pd.getProxy()) != null) {
-              port = pd.getPort();
-              if (pd.isKeepSettings()) {
-                proxyHost = proxy;
-                proxyPort = port;
-              }
-              Properties prop = System.getProperties();
-              prop.put("http.proxyHost", proxy);
-              prop.put("http.proxyPort", port);
-            }
-          } else System.exit(0);
-        } //end Proxy config
-
 		loadVerse(props.getProperty("lastVerse", "jn 1:1"));
 		if (!localKJV)
-			exportRangeButton.setVisible(false);
+			jButton3.setVisible(false);
 	}
 
+
 	void savePreferences() {
 		Properties props = new Properties();
 		props.setProperty("localKJV", (localKJV) ? "true" : "false");
@@ -376,9 +354,6 @@
 		props.setProperty("currentRange", rangeText.getText());
 		props.setProperty("userID", userIDText.getText());
 		props.setProperty("lastVerse", currentKey);
-        props.setProperty("proxyHost", proxyHost);
-        props.setProperty("proxyPort", proxyPort);
-        props.setProperty("useProxy", (useProxy) ? "true" : "false");
 		try {
 			props.store(new FileOutputStream("ModEdit.properties"), "ModEdit Properties");
 		}
@@ -386,6 +361,9 @@
 
 	}
 
+
+
+
 	void loadTextArea(JTextArea control, StringBuffer agentResult) {
 		try {
 			StringBuffer newText = agentResult;
@@ -401,6 +379,7 @@
 		}
 	}
 
+
 	void loadHTML(JEditorPane control, StringBuffer agentResult) {
 		try {
 			StringBuffer newText = agentResult;
@@ -457,6 +436,7 @@
 		return retVal;
 	}
 
+
 	int callServer(String command, StringBuffer result) {
 		try {
 			String lookupURL = "http://www.crosswire.org/sword/kjv2003/modedit.jsp?" + command;
@@ -521,7 +501,7 @@
 			if (!localThayer)
 				callServer("action=h&mod=Thayer&key="+tagInfo.strong, agentResult);
 			else callLocalAgent(new String[] {util, "h", "Thayer", tagInfo.strong}, agentResult, true);
-			loadHTML(strongTextEditor, agentResult);
+			loadHTML(jEditorPane3, agentResult);
 
 		} catch (Throwable t) {
 			t.printStackTrace();
@@ -531,7 +511,7 @@
 		wordText.setText(tagInfo.word);
 
 		try {
-			greekTextEditor.getHighlighter().changeHighlight(greekHighlight, tagInfo.start, tagInfo.end);
+			jEditorPane2.getHighlighter().changeHighlight(greekHighlight, tagInfo.start, tagInfo.end);
 		}
 		catch (Exception e) { e.printStackTrace(); }
 	}
@@ -560,12 +540,23 @@
 		}
 	}
 
-	void translatedTextEditor_mouseClicked(MouseEvent e) {
+	void jEditorPane1_mouseClicked(MouseEvent e) {
 	}
 
-	void translatedTextEditor_mouseDragged(MouseEvent e) {
+class Frame1_jEditorPane1_mouseAdapter extends java.awt.event.MouseAdapter {
+	Frame1 adaptee;
+
+	Frame1_jEditorPane1_mouseAdapter(Frame1 adaptee) {
+		this.adaptee = adaptee;
+	}
+	public void mouseClicked(MouseEvent e) {
+		adaptee.jEditorPane1_mouseClicked(e);
+	}
+    }
+
+	void jEditorPane1_mouseDragged(MouseEvent e) {
 		Point clickPoint = e.getPoint();
-		int position = translatedTextEditor.viewToModel(clickPoint);
+		int position = jEditorPane1.viewToModel(clickPoint);
 		boolean sizeTag = false;
 		if (!getCurrentAction().equals("[none]")) {
 			if (getCurrentAction().equals("SizeTag"))
@@ -628,10 +619,10 @@
 
 		boolean addNewImage = false;
 
-		HTMLDocument doc = (HTMLDocument)translatedTextEditor.getDocument();
+		HTMLDocument doc = (HTMLDocument)jEditorPane1.getDocument();
 		StringWriter writer = new StringWriter();
 		try {
-			translatedTextEditor.getEditorKit().write(writer, doc, 0, doc.getLength());
+			jEditorPane1.getEditorKit().write(writer, doc, 0, doc.getLength());
 		}
 		catch(Exception ex) {
 			ex.printStackTrace();
@@ -785,13 +776,13 @@
 		}
 		htmlstr = html.toString();
 		try {
-			translatedTextEditor.setText("");
-			translatedTextEditor.getEditorKit().read(new StringReader(html.toString()), doc, 0);
+			jEditorPane1.setText("");
+			jEditorPane1.getEditorKit().read(new StringReader(html.toString()), doc, 0);
 		}
 		catch(Exception ex) {
 			ex.printStackTrace();
 		}
-	} //end of slideTag
+	}
 
 
 	int getTagFromPosition(int offset) {
@@ -800,7 +791,7 @@
 		int retVal = 0;
 
 		//remove selection
-		translatedTextEditor.setSelectionEnd(translatedTextEditor.getSelectionStart());
+		jEditorPane1.setSelectionEnd(jEditorPane1.getSelectionStart());
 
 		if (position != currentCaret) {
 			currentCaret = position;
@@ -810,9 +801,9 @@
 			String startSearch = startTag1;
 			String endSearch = endTag1;
 
-			HTMLDocument doc = (HTMLDocument)translatedTextEditor.getDocument();
+			HTMLDocument doc = (HTMLDocument)jEditorPane1.getDocument();
 			try {
-				translatedTextEditor.getEditorKit().read(new StringReader("$$$"), doc, position);
+				jEditorPane1.getEditorKit().read(new StringReader("$$$"), doc, position);
 			}
 			catch(Exception ex) {
 				ex.printStackTrace();
@@ -820,7 +811,7 @@
 
 			StringWriter writer = new StringWriter();
 			try {
-				translatedTextEditor.getEditorKit().write(writer, doc, 0, doc.getLength());
+				jEditorPane1.getEditorKit().write(writer, doc, 0, doc.getLength());
 			}
 			catch(Exception ex) {
 				ex.printStackTrace();
@@ -855,8 +846,8 @@
 			}
 
 			try {
-				translatedTextEditor.setText("");
-				translatedTextEditor.getEditorKit().read(new StringReader(html.toString()), doc, 0);
+				jEditorPane1.setText("");
+				jEditorPane1.getEditorKit().read(new StringReader(html.toString()), doc, 0);
 			}
 			catch(Exception ex) {
 				ex.printStackTrace();
@@ -868,7 +859,7 @@
 	void moveTag(int tagNum, int position, boolean sizeTag) {
 
 		//remove selection
-		translatedTextEditor.setSelectionEnd(translatedTextEditor.getSelectionStart());
+		jEditorPane1.setSelectionEnd(jEditorPane1.getSelectionStart());
 
 		String startTag = startTag1+Integer.toString(tagNum)+startTag2;
 		String endTag = endTag1+Integer.toString(tagNum)+endTag2;
@@ -877,9 +868,9 @@
 
 		boolean addNewImage = false;
 
-		HTMLDocument doc = (HTMLDocument)translatedTextEditor.getDocument();
+		HTMLDocument doc = (HTMLDocument)jEditorPane1.getDocument();
 		try {
-			translatedTextEditor.getEditorKit().read(new StringReader("$$$"), doc, position);
+			jEditorPane1.getEditorKit().read(new StringReader("$$$"), doc, position);
 		}
 		catch(Exception ex) {
 			ex.printStackTrace();
@@ -887,7 +878,7 @@
 
 		StringWriter writer = new StringWriter();
 		try {
-			translatedTextEditor.getEditorKit().write(writer, doc, 0, doc.getLength());
+			jEditorPane1.getEditorKit().write(writer, doc, 0, doc.getLength());
 		}
 		catch(Exception ex) {
 			ex.printStackTrace();
@@ -948,8 +939,8 @@
 		}
 		htmlstr = html.toString();
 		try {
-			translatedTextEditor.setText("");
-			translatedTextEditor.getEditorKit().read(new StringReader(html.toString()), doc, 0);
+			jEditorPane1.setText("");
+			jEditorPane1.getEditorKit().read(new StringReader(html.toString()), doc, 0);
 		}
 		catch(Exception ex) {
 			ex.printStackTrace();
@@ -957,7 +948,7 @@
 	}
 
 
-	void translatedTextEditor_keyTyped(KeyEvent e) {
+	void jEditorPane1_keyTyped(KeyEvent e) {
 	}
 
 
@@ -978,8 +969,8 @@
 		else if ((!getCurrentAction().equals("[none]")) && (action.equals("[none]"))) {
 			slideTag(getCurrentTag(), 0, false, startTag2g, endTag2g);
 		}
-		actionLabel.setText(action);
-		currentTagText.setText(Integer.toString(tag));
+		jLabel3.setText(action);
+		jTextField1.setText(Integer.toString(tag));
 		if (lastTag != tag) {
 			showStrongs();
 		}
@@ -987,16 +978,16 @@
 
 
 	public String getCurrentAction() {
-		return actionLabel.getText();
+		return jLabel3.getText();
 	}
 
 
 	public int getCurrentTag() {
-		return Integer.parseInt(currentTagText.getText());
+		return Integer.parseInt(jTextField1.getText());
 	}
 
 
-	void translatedTextEditor_keyPressed(KeyEvent e) {
+	void jEditorPane1_keyPressed(KeyEvent e) {
 		handleKeyboard(e);
 	}
 
@@ -1158,7 +1149,7 @@
 		java.util.Arrays.sort(tagKeys, new Comparator() {
 				public int compare(Object o1, Object o2) { return Integer.parseInt((String)o1) - Integer.parseInt((String)o2); }
 			});
-		String greek = greekTextEditor.getText();
+		String greek = jEditorPane2.getText();
 		int pos = 0;
 		for (int i = 0; i < tagKeys.length; i++) {
 			TagInfo tag = (TagInfo)tags.get(tagKeys[i]);
@@ -1242,21 +1233,21 @@
 
 			text.append("</BODY></HTML>");
 			BufferedReader in = new BufferedReader(new StringReader(text.toString()));
-			translatedTextEditor.setText("");
-			HTMLDocument doc = (HTMLDocument)translatedTextEditor.getDocument();
-			translatedTextEditor.getEditorKit().read(in, doc, 0);
-			translatedTextEditor.setCaretPosition(0);
+			jEditorPane1.setText("");
+			HTMLDocument doc = (HTMLDocument)jEditorPane1.getDocument();
+			jEditorPane1.getEditorKit().read(in, doc, 0);
+			jEditorPane1.setCaretPosition(0);
 
 			StringBuffer agentResult = new StringBuffer();
 			if (!localTR)
 				callServer("action=h&key=" + URLEncoder.encode(key) +"&mod=TR", agentResult);
 			else callLocalAgent(new String[] {util, "h", "TR", key}, agentResult, true);
-			loadTextArea(greekTextEditor, agentResult);
+			loadTextArea(jEditorPane2, agentResult);
 
 			computeTagOffsets();
 
 			currentKey = key;
-			currentVerseText.setText(currentKey);
+			jTextField3.setText(currentKey);
 		}
 		catch(Exception e) {
 			e.printStackTrace();
@@ -1293,23 +1284,23 @@
 		}
 	}
 
-	void loadVerseButton_actionPerformed(ActionEvent e) {
-		loadVerse(currentVerseText.getText());
+	void jButton5_actionPerformed(ActionEvent e) {
+		loadVerse(jTextField3.getText());
 	}
 
-	void currentVerseText_keyTyped(KeyEvent e) {
+	void jTextField3_keyTyped(KeyEvent e) {
 	}
 
 	void this_keyPressed(KeyEvent e) {
 		if (e.getKeyCode() == e.VK_ENTER) {
-			loadVerse(currentVerseText.getText());
+			loadVerse(jTextField3.getText());
 		}
 		else if (e.getKeyCode() == e.VK_TAB) {
 			nextTag();
 		}
 	}
 
-	void guessTagButton_actionPerformed(ActionEvent e) {
+	void jButton2_actionPerformed(ActionEvent e) {
 		guessTagPositions();
 	}
 
@@ -1322,7 +1313,7 @@
 			moveTag(Integer.parseInt((String)tagKeys[i]), 1, false);
 		}
 		for (int i = 0; i < tagKeys.length; i++) {
-			String text = translatedTextEditor.getText();
+			String text = jEditorPane1.getText();
 			StringBuffer sb = new StringBuffer(text);
 			replaceTagsWithHolders(sb);
 			stripTags(sb);
@@ -1379,7 +1370,7 @@
 		}
 	}
 
-	void exportRangeButton_actionPerformed(ActionEvent e) {
+	void jButton3_actionPerformed(ActionEvent e) {
 		exportRange(rangeText.getText(), "export.zip");
 		JOptionPane.showMessageDialog(this, "File [export.zip] written.");
 	}
@@ -1425,9 +1416,9 @@
 			setCurrentAction(Integer.parseInt((String)tagKeys[0]), "MoveTag");
 	}
 
-	void greekTextEditor_mouseClicked(MouseEvent e) {
+	void jEditorPane2_mouseClicked(MouseEvent e) {
 		Point clickPoint = e.getPoint();
-		int position = greekTextEditor.viewToModel(clickPoint);
+		int position = jEditorPane2.viewToModel(clickPoint);
 		Object [] tagKeys = tags.keySet().toArray();
 		java.util.Arrays.sort(tagKeys, new Comparator() {
 				public int compare(Object o1, Object o2) { return Integer.parseInt((String)o1) - Integer.parseInt((String)o2); }
@@ -1461,10 +1452,10 @@
 
 
 	public String getRawEntry() {
-		HTMLDocument doc = (HTMLDocument)translatedTextEditor.getDocument();
+		HTMLDocument doc = (HTMLDocument)jEditorPane1.getDocument();
 		StringWriter writer = new StringWriter();
 		try {
-			translatedTextEditor.getEditorKit().write(writer, doc, 0, doc.getLength());
+			jEditorPane1.getEditorKit().write(writer, doc, 0, doc.getLength());
 		}
 		catch(Exception ex) {
 			ex.printStackTrace();
@@ -1522,7 +1513,7 @@
 			nextTag();
 	}
 
-	void greekTextEditor_keyPressed(KeyEvent e) {
+	void jEditorPane2_keyPressed(KeyEvent e) {
 		handleKeyboard(e);
 	}
 
@@ -1530,7 +1521,7 @@
 		exportRange(rangeText.getText(), "export.zip");
 	}
 
-	void loginButton_actionPerformed(ActionEvent e) {
+	void jButton4_actionPerformed(ActionEvent e) {
 		login(userIDText.getText());
 	}
 
@@ -1538,36 +1529,25 @@
 }
 
 
-class MainFrame_translatedTextEditor_mouseAdapter extends java.awt.event.MouseAdapter {
-    MainFrame adaptee;
-
-    MainFrame_translatedTextEditor_mouseAdapter(MainFrame adaptee) {
-        this.adaptee = adaptee;
-    }
-    public void mouseClicked(MouseEvent e) {
-        adaptee.translatedTextEditor_mouseClicked(e);
-    }
-}
-
-class MainFrame_translatedTextEditor_mouseMotionAdapter extends java.awt.event.MouseMotionAdapter {
-	MainFrame adaptee;
+class Frame1_jEditorPane1_mouseMotionAdapter extends java.awt.event.MouseMotionAdapter {
+	Frame1 adaptee;
 
-	MainFrame_translatedTextEditor_mouseMotionAdapter(MainFrame adaptee) {
+	Frame1_jEditorPane1_mouseMotionAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void mouseDragged(MouseEvent e) {
-		adaptee.translatedTextEditor_mouseDragged(e);
+		adaptee.jEditorPane1_mouseDragged(e);
 	}
 }
 
-class MainFrame_translatedTextEditor_keyAdapter extends java.awt.event.KeyAdapter {
-	private MainFrame adaptee;
+class Frame1_jEditorPane1_keyAdapter extends java.awt.event.KeyAdapter {
+	private Frame1 adaptee;
 
-	MainFrame_translatedTextEditor_keyAdapter(MainFrame adaptee) {
+	Frame1_jEditorPane1_keyAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void keyTyped(KeyEvent e) {
-		adaptee.translatedTextEditor_keyTyped(e);
+		adaptee.jEditorPane1_keyTyped(e);
 	}
 }
 
@@ -1594,32 +1574,32 @@
 	public boolean wholeWord;
 }
 
-class MainFrame_loadVerseButton_actionAdapter implements java.awt.event.ActionListener {
-	private MainFrame adaptee;
+class Frame1_jButton5_actionAdapter implements java.awt.event.ActionListener {
+	private Frame1 adaptee;
 
-	MainFrame_loadVerseButton_actionAdapter(MainFrame adaptee) {
+	Frame1_jButton5_actionAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void actionPerformed(ActionEvent e) {
-		adaptee.loadVerseButton_actionPerformed(e);
+		adaptee.jButton5_actionPerformed(e);
 	}
 }
 
-class MainFrame_currentVerseText_keyAdapter extends java.awt.event.KeyAdapter {
-	private MainFrame adaptee;
+class Frame1_jTextField3_keyAdapter extends java.awt.event.KeyAdapter {
+	private Frame1 adaptee;
 
-	MainFrame_currentVerseText_keyAdapter(MainFrame adaptee) {
+	Frame1_jTextField3_keyAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void keyTyped(KeyEvent e) {
-		adaptee.currentVerseText_keyTyped(e);
+		adaptee.jTextField3_keyTyped(e);
 	}
 }
 
-class MainFrame_this_keyAdapter extends java.awt.event.KeyAdapter {
-	private MainFrame adaptee;
+class Frame1_this_keyAdapter extends java.awt.event.KeyAdapter {
+	private Frame1 adaptee;
 
-	MainFrame_this_keyAdapter(MainFrame adaptee) {
+	Frame1_this_keyAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void keyPressed(KeyEvent e) {
@@ -1627,43 +1607,43 @@
 	}
 }
 
-class MainFrame_guessTagButton_actionAdapter implements java.awt.event.ActionListener {
-	private MainFrame adaptee;
+class Frame1_jButton2_actionAdapter implements java.awt.event.ActionListener {
+	private Frame1 adaptee;
 
-	MainFrame_guessTagButton_actionAdapter(MainFrame adaptee) {
+	Frame1_jButton2_actionAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void actionPerformed(ActionEvent e) {
-		adaptee.guessTagButton_actionPerformed(e);
+		adaptee.jButton2_actionPerformed(e);
 	}
 }
 
-class MainFrame_signSaveButton_actionAdapter implements java.awt.event.ActionListener {
-	private MainFrame adaptee;
+class Frame1_jButton1_actionAdapter implements java.awt.event.ActionListener {
+	private Frame1 adaptee;
 
-	MainFrame_signSaveButton_actionAdapter(MainFrame adaptee) {
+	Frame1_jButton1_actionAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void actionPerformed(ActionEvent e) {
-		adaptee.signSaveButton_actionPerformed(e);
+		adaptee.jButton1_actionPerformed(e);
 	}
 }
 
-class MainFrame_greekTextEditor_mouseAdapter extends java.awt.event.MouseAdapter {
-	private MainFrame adaptee;
+class Frame1_jEditorPane2_mouseAdapter extends java.awt.event.MouseAdapter {
+	private Frame1 adaptee;
 
-	MainFrame_greekTextEditor_mouseAdapter(MainFrame adaptee) {
+	Frame1_jEditorPane2_mouseAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void mouseClicked(MouseEvent e) {
-		adaptee.greekTextEditor_mouseClicked(e);
+		adaptee.jEditorPane2_mouseClicked(e);
 	}
 }
 
-class MainFrame_contentPane_keyAdapter extends java.awt.event.KeyAdapter {
-	private MainFrame adaptee;
+class Frame1_contentPane_keyAdapter extends java.awt.event.KeyAdapter {
+	private Frame1 adaptee;
 
-	MainFrame_contentPane_keyAdapter(MainFrame adaptee) {
+	Frame1_contentPane_keyAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void keyPressed(KeyEvent e) {
@@ -1671,35 +1651,35 @@
 	}
 }
 
-class MainFrame_greekTextEditor_keyAdapter extends java.awt.event.KeyAdapter {
-	private MainFrame adaptee;
+class Frame1_jEditorPane2_keyAdapter extends java.awt.event.KeyAdapter {
+	private Frame1 adaptee;
 
-	MainFrame_greekTextEditor_keyAdapter(MainFrame adaptee) {
+	Frame1_jEditorPane2_keyAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void keyPressed(KeyEvent e) {
-		adaptee.greekTextEditor_keyPressed(e);
+		adaptee.jEditorPane2_keyPressed(e);
 	}
 }
 
-class MainFrame_exportRangeButton_actionAdapter implements java.awt.event.ActionListener {
-	private MainFrame adaptee;
+class Frame1_jButton3_actionAdapter implements java.awt.event.ActionListener {
+	private Frame1 adaptee;
 
-	MainFrame_exportRangeButton_actionAdapter(MainFrame adaptee) {
+	Frame1_jButton3_actionAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void actionPerformed(ActionEvent e) {
-		adaptee.exportRangeButton_actionPerformed(e);
+		adaptee.jButton3_actionPerformed(e);
 	}
 }
 
-class MainFrame_loginButton_actionAdapter implements java.awt.event.ActionListener {
-	private MainFrame adaptee;
+class Frame1_jButton4_actionAdapter implements java.awt.event.ActionListener {
+	private Frame1 adaptee;
 
-	MainFrame_loginButton_actionAdapter(MainFrame adaptee) {
+	Frame1_jButton4_actionAdapter(Frame1 adaptee) {
 		this.adaptee = adaptee;
 	}
 	public void actionPerformed(ActionEvent e) {
-		adaptee.loginButton_actionPerformed(e);
+		adaptee.jButton4_actionPerformed(e);
 	}
 }
