Shows both revisions (more helpful than either alone)

Client/src/org/pokenet/client/ui/LoginScreen.java

@@ -182,10 +182,13 @@ public void setServerRevision(String rev) {
 	 */
 	private void setClientRevision() {
 		String path = System.getProperty("res.path");
+		String gCode = "pokenetonline.googlecode.com/svn";
+		String SG = "";
 		if (path == null || path.equalsIgnoreCase("NULL")) {
 			path = "./";
 		}
 		File f = new File(path + "/.svn/entries");
+
 		try {
 			if (f.exists()) {
 				Scanner s = new Scanner(f);
@@ -194,34 +197,27 @@ private void setClientRevision() {
 				s.nextLine();
 
 				m_clientRev = new Label("Client Version: svn:" + s.nextLine());
-				m_clientRev.setFont(GameClient.getFontSmall());
-				m_clientRev.setForeground(new Color(255, 255, 255));
-				m_clientRev.pack();
-				m_clientRev.setLocation(4, 600 - m_clientRev.getHeight() - 8);
-				this.add(m_clientRev);
-
+				f = new File(path + "rev.txt");
+				s = new Scanner(f);
+				m_clientRev.setText(m_clientRev.getText() + " // " + s.nextLine());
+
 			} else {
 				f = new File(path + "rev.txt");
 				Scanner s;
 				s = new Scanner(f);
 
 				m_clientRev = new Label("Client Version: r" + s.nextLine());
-				m_clientRev.setFont(GameClient.getFontSmall());
-				m_clientRev.setForeground(new Color(255, 255, 255));
-				m_clientRev.pack();
-				m_clientRev.setLocation(4, 600 - m_clientRev.getHeight() - 8);
-				this.add(m_clientRev);
-
 			}
 		} catch (Exception e) {
 			System.out.println(e.getMessage());
 			m_clientRev = new Label("Client Version: ?");
-			m_clientRev.setFont(GameClient.getFontSmall());
-			m_clientRev.setForeground(new Color(255, 255, 255));
-			m_clientRev.pack();
-			m_clientRev.setLocation(4, 600 - m_clientRev.getHeight() - 8);
-			this.add(m_clientRev);
 		}
+
+		m_clientRev.setFont(GameClient.getFontSmall());
+		m_clientRev.setForeground(new Color(255, 255, 255));
+		m_clientRev.pack();
+		m_clientRev.setLocation(4, 600 - m_clientRev.getHeight() - 8);
+		this.add(m_clientRev);
 
 	}