preparing for first customer use

Author: dsjoerg

gg.ico

@@ -129,13 +129,8 @@ public void actionPerformed( final ActionEvent event ) {
 		contentBox.add( row );
 		contentBox.add( Box.createVerticalStrut( SPACING ) );
 		row = Box.createHorizontalBox();
-		row.add( new JLabel( "User name:" ) );
-		row.add( Utils.createSettingTextField( Settings.KEY_USER_NAME ) );
-		contentBox.add( row );
-		contentBox.add( Box.createVerticalStrut( SPACING ) );
-		row = Box.createHorizontalBox();
 		row.add( new JLabel( "Upload key:" ) );
-		row.add( Utils.createSettingTextField( Settings.KEY_UPLOAD_KEY ) );
+		row.add( Utils.createSettingTextField( Settings.KEY_AUTH_TOKEN) );
 		contentBox.add( row );
 		Utils.formLayoutBox( contentBox, 1 );
 
@@ -158,7 +153,7 @@ public void actionPerformed( final ActionEvent event ) {
 
 		contentBox.add( Box.createVerticalStrut( SPACING ) );
 		wrapper = new JPanel( new FlowLayout( FlowLayout.RIGHT, 0, 0 ) );
-		wrapper.add( Utils.createLinkLabel("Online Help", Consts.ONLINE_HELP_LINK));
+//		wrapper.add( Utils.createLinkLabel("Online Help", Consts.ONLINE_HELP_LINK));
 		wrapper.add( Box.createHorizontalStrut( 20 ) );
 		final JButton exitButton = new JButton( "Quit and Stop Uploading Replays" );
 		exitButton.addActionListener( new ActionListener() {
@@ -169,7 +164,7 @@ public void actionPerformed( final ActionEvent event ) {
 		} );
 		wrapper.add( exitButton );
 		wrapper.add( Box.createHorizontalStrut( 10 ) );
-		wrapper.add( Utils.createLinkLabel( Consts.APP_VERSION, Consts.ABOUT_UPLOADER_LINK ) );
+//		wrapper.add( Utils.createLinkLabel( Consts.APP_VERSION, Consts.ABOUT_UPLOADER_LINK ) );
 		contentBox.add( wrapper );
 
 		Utils.alignBox( contentBox, SwingConstants.CENTER );

src/com/ggtracker/uploader/MainFrame.java

@@ -145,10 +145,9 @@ private File getLastReplay( final File startFolder ) {
 
 	/** Name of the request version parameter. */
 	private static final String PARAM_NAME_REQUEST_VERSION = "requestVersion";
-	/** Name of the user name parameter.       */
-	private static final String PARAM_NAME_USER_NAME       = "userName";
-	/** Name of the password parameter.        */
-	private static final String PARAM_NAME_PASSWORD        = "password";
+
+	private static final String PARAM_NAME_AUTH_TOKEN      = "accessToken";
+
 	/** Name of the description parameter.     */
 	private static final String PARAM_NAME_DESCRIPTION     = "description";
 	/** Name of the file name parameter.       */
@@ -197,12 +196,13 @@ private void uploadNewReplay( final File lastReplayFile ) {
     			paramsMap.put( PARAM_NAME_FILE_NAME      , lastReplayFile.getName() );
     			paramsMap.put( PARAM_NAME_FILE_SIZE      , Long.toString( lastReplayFile.length() ) );
     			paramsMap.put( PARAM_NAME_DESCRIPTION    , "" ); // Not used
-    			paramsMap.put( PARAM_NAME_USER_NAME      , Settings.get( Settings.KEY_USER_NAME ) );
-    			paramsMap.put( PARAM_NAME_PASSWORD       , Settings.get( Settings.KEY_UPLOAD_KEY ) );
+//    			paramsMap.put( PARAM_NAME_USER_NAME      , Settings.get( Settings.KEY_USER_NAME ) );
+    			paramsMap.put( PARAM_NAME_AUTH_TOKEN      , Settings.get( Settings.KEY_AUTH_TOKEN ) );
+//    			paramsMap.put( PARAM_NAME_PASSWORD       , Settings.get( Settings.KEY_UPLOAD_KEY ) );
     			paramsMap.put( PARAM_NAME_FILE_MD5       , fileMd5 );
     			paramsMap.put( PARAM_NAME_FILE_CONTENT   , fileBase64 );
 
-    			httpPost = new HttpPost( "http://ggtracker.com/api/upload", paramsMap );
+    			httpPost = new HttpPost( "http://ggtracker.com/replays/drop", paramsMap );
 
     			if ( !httpPost.connect() ) {
     				System.out.println( "Failed to connect!" );

src/com/ggtracker/uploader/ReplayFolderMonitor.java

@@ -25,12 +25,11 @@ public class Settings {
 	public static final File SETTINGS_FILE = new File( Consts.FOLDER_USER_CONTENT, "settings.xml" );
 
 
-	/** Replay folder setting.             */
 	public static final String KEY_REPLAY_FOLDER             = "replayFolder";
-	/** User name setting.                 */
 	public static final String KEY_USER_NAME                 = "userName";
-	/** Upload key setting.                */
 	public static final String KEY_UPLOAD_KEY                = "uploadKey";
+	public static final String KEY_AUTH_TOKEN                = "authToken";
+	
 	/** Saved with version setting.        */
 	public static final String KEY_META_SAVED_WITH_VERSION   = "meta.savedWithVersion";
 	/** Save time setting.                 */