google reader is no more :(

src/main/java/com/commafeed/frontend/CommaFeedApplication.java

@@ -75,9 +75,9 @@ public class CommaFeedApplication extends AuthenticatedWebApplication {
 		mountPage("logout", LogoutPage.class);
 		mountPage("error", DisplayExceptionPage.class);
 		
-		mountPage("google/import/redirect", GoogleImportRedirectPage.class);
+//		mountPage("google/import/redirect", GoogleImportRedirectPage.class);
-		mountPage(GoogleImportCallbackPage.PAGE_PATH,
+//		mountPage(GoogleImportCallbackPage.PAGE_PATH,
-				GoogleImportCallbackPage.class);
+//				GoogleImportCallbackPage.class);
 
 		mountPage("next", NextUnreadRedirectPage.class);
 

src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java

@@ -22,9 +22,6 @@ public class RegistrationRequest implements Serializable {
 	@ApiProperty(value = "email address for password recovery", required = true)
 	private String email;
 
-	@ApiProperty(value = "not used through the api", required = false)
-	private boolean googleImport = true;
-
 	public String getName() {
 		return name;
 	}
@@ -48,13 +45,4 @@ public class RegistrationRequest implements Serializable {
 	public void setEmail(String email) {
 		this.email = email;
 	}
-
-	public boolean isGoogleImport() {
-		return googleImport;
-	}
-
-	public void setGoogleImport(boolean googleImport) {
-		this.googleImport = googleImport;
-	}
-
 }

src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.html

@@ -22,13 +22,6 @@
 					<input type="email" wicket:id="email" class="input-block-level"></input>
 				</div>
 			</div>
-			<p class="help-block">
-				<label class="checkbox">
-					<input wicket:id="import" type="checkbox" />
-					Google Reader import
-				</label> 
-				You'll be able to import later.
-			</p>
 			<div>
 				<input type="submit" class="btn btn-primary" value="Register" />
 			</div>

src/main/java/com/commafeed/frontend/pages/components/RegisterPanel.java

@@ -7,7 +7,6 @@ import javax.inject.Inject;
 import org.apache.wicket.authentication.IAuthenticationStrategy;
 import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
 import org.apache.wicket.feedback.ContainerFeedbackMessageFilter;
-import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.PasswordTextField;
 import org.apache.wicket.markup.html.form.RequiredTextField;
@@ -27,7 +26,6 @@ import com.commafeed.backend.services.ApplicationSettingsService;
 import com.commafeed.backend.services.UserService;
 import com.commafeed.frontend.CommaFeedSession;
 import com.commafeed.frontend.model.request.RegistrationRequest;
-import com.commafeed.frontend.pages.GoogleImportRedirectPage;
 import com.commafeed.frontend.utils.ModelFactory.MF;
 
 @SuppressWarnings("serial")
@@ -61,15 +59,8 @@ public class RegisterPanel extends Panel {
 					strategy.save(req.getName(), req.getPassword());
 					CommaFeedSession.get().signIn(req.getName(),
 							req.getPassword());
-
-					if (req.isGoogleImport()) {
-						setResponsePage(GoogleImportRedirectPage.class);
-					} else {
-						setResponsePage(getApplication().getHomePage());
-					}
-				} else {
-					setResponsePage(getApplication().getHomePage());
 				}
+				setResponsePage(getApplication().getHomePage());
 			}
 		};
 		add(form);
@@ -111,7 +102,5 @@ public class RegisterPanel extends Panel {
 						}
 					}
 				}));
-		form.add(new CheckBox("import", MF.m(model, p.isGoogleImport())));
-
 	}
 }

src/main/resources/i18n/en.properties

@@ -21,7 +21,7 @@ import.google_reader_prefix=Let me import your feeds from your
 import.google_reader_suffix= account.
 import.google_download=Alternatively, upload your subscriptions.xml file.
 import.google_download_link=Download it from here.
-import.xml_file=XML File
+import.xml_file=OPML File
 
 new_category.name=Name
 new_category.parent=Parent

src/main/webapp/templates/_subscribe.html

@@ -63,15 +63,6 @@
 		</div>
 		<form class="form-horizontal" action="rest/feed/import" method="post" enctype="multipart/form-data">
 			<div class="modal-body">
-				<div class="control-group">
-					<div>${import.google_reader_prefix}
-						<a href="google/import/redirect">						
-							<img src="images/google_reader_icon.png" class="favicon" />
-							Google Reader
-						</a>${import.google_reader_suffix}
-					</div>
-					<div>${import.google_download} <a target="_blank" href="https://www.google.com/reader/subscriptions/export">${import.google_download_link}</a></div>
-				</div>
 				<div class="control-group">
 					<label class="control-label">${import.xml_file}</label>
 					<div class="controls">