Added support for latest Flickr API, release v1.2

Author: m-mohr

CHANGELOG

@@ -1,5 +1,5 @@
 Version 1.2
-- ...
+- Support for latest Flickr API
 
 Version 1.1.1
 - File names comply with flickr guidelines

EasyFlickrBackup.jar

@@ -1,14 +1,14 @@
 # EasyFlickrBackup
 Easy to use application to download and backup all your photos in original size from flickr. 
 
-* Current version: 1.1.1
+* Current version: 1.2
 * License: MIT License
 
 ![Screenshot](https://c2.staticflickr.com/2/1701/25533200184_1d88bdfa68_o.png)
 
 ## System requirements
 * Operating system: Windows, Linux, Mac OS X
-* Software: Java Runtime Environment >= 7.0 ([Download](https://www.java.com/download/))
+* Software: Java Runtime Environment >= 8.0 ([Download](https://www.java.com/download/))
 
 ## Download & Installation
 

README.md

@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>com.flickr4java</groupId>
 			<artifactId>flickr4java</artifactId>
-			<version>2.16</version>
+			<version>3.0.2</version>
 		</dependency>
 	</dependencies>
 	<build>

pom.xml

@@ -135,7 +135,8 @@
             <Property name="editable" type="boolean" value="false"/>
             <Property name="columns" type="int" value="20"/>
             <Property name="rows" type="int" value="5"/>
-            <Property name="text" type="java.lang.String" value="Version 1.2&#xa;- ...&#xa;&#xa;Version 1.1.1&#xa;- File names comply with flickr guidelines&#xa;&#xa;Version 1.1&#xa;- Download process about 10 times faster&#xa;- Pause &amp; Resume the download process at any time&#xa;- Store files in a separate directory per user&#xa;&#xa;Version 1.0&#xa;- Initial release"/>
+            <Property name="text" type="java.lang.String" value="Version 1.2&#xa;- Support for latest Flickr API&#xa;&#xa;Version 1.1.1&#xa;- File names comply with flickr guidelines&#xa;&#xa;Version 1.1&#xa;- Download process about 10 times faster&#xa;- Pause &amp; Resume the download process at any time&#xa;- Store files in a separate directory per user&#xa;&#xa;Version 1.0&#xa;- Initial release"/>
+            <Property name="caretPosition" type="int" value="0"/>
           </Properties>
         </Component>
       </SubComponents>

src/main/java/de/lutana/easyflickrbackup/AboutDlg.form

@@ -82,7 +82,8 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
         jTextArea1.setEditable(false);
         jTextArea1.setColumns(20);
         jTextArea1.setRows(5);
-        jTextArea1.setText("Version 1.2\n- ...\n\nVersion 1.1.1\n- File names comply with flickr guidelines\n\nVersion 1.1\n- Download process about 10 times faster\n- Pause & Resume the download process at any time\n- Store files in a separate directory per user\n\nVersion 1.0\n- Initial release");
+        jTextArea1.setText("Version 1.2\n- Support for latest Flickr API\n\nVersion 1.1.1\n- File names comply with flickr guidelines\n\nVersion 1.1\n- Download process about 10 times faster\n- Pause & Resume the download process at any time\n- Store files in a separate directory per user\n\nVersion 1.0\n- Initial release");
+        jTextArea1.setCaretPosition(0);
         jScrollPane1.setViewportView(jTextArea1);
 
         jLabel7.setText("License:");

src/main/java/de/lutana/easyflickrbackup/AboutDlg.java

@@ -37,6 +37,8 @@
 import com.flickr4java.flickr.photos.PhotosInterface;
 import com.flickr4java.flickr.photos.Size;
 import com.flickr4java.flickr.util.FileAuthStore;
+import com.github.scribejava.core.model.OAuth1RequestToken;
+import com.github.scribejava.core.model.OAuth1Token;
 import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.Toolkit;
@@ -50,8 +52,6 @@
 import java.util.Set;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
-import org.scribe.model.Token;
-import org.scribe.model.Verifier;
 
 public class GUI extends javax.swing.JFrame implements Runnable {
 
@@ -359,7 +359,7 @@ public File getBackupDirectory() {
 
     private void authBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_authBtnActionPerformed
 		AuthInterface authInterface = flickr.getAuthInterface();
-		Token accessToken = authInterface.getRequestToken();
+		OAuth1RequestToken accessToken = authInterface.getRequestToken();
 
 		JOptionPane.showMessageDialog(this, "You are redirected to the Flickr authentication process now.\r\nAfterwards you need to enter the authentication token here.");
 		String urlString = authInterface.getAuthorizationUrl(accessToken, Permission.READ);
@@ -373,7 +373,7 @@ private void authBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
 			return;
 		}
 		try {
-			Token requestToken = authInterface.getAccessToken(accessToken, new Verifier(tokenKey));
+			OAuth1Token requestToken = authInterface.getAccessToken(accessToken, tokenKey);
 			Auth auth = authInterface.checkToken(requestToken);
 			StringContainer.Auth ac = new StringContainer.Auth(auth);
 			userBox.addItem(ac);