Refactor using inheritance loading both container and content XIB into same controller.

Author: dkocher

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BookmarkContainerController.java

@@ -18,20 +18,22 @@
 import ch.cyberduck.binding.Action;
 import ch.cyberduck.binding.Delegate;
 import ch.cyberduck.binding.Outlet;
-import ch.cyberduck.binding.SheetController;
+import ch.cyberduck.binding.application.NSPopUpButton;
 import ch.cyberduck.binding.application.NSView;
 import ch.cyberduck.binding.application.NSWindow;
 import ch.cyberduck.core.Host;
+import ch.cyberduck.core.LoginOptions;
 import ch.cyberduck.core.ProviderHelpServiceFactory;
 import ch.cyberduck.core.local.BrowserLauncherFactory;
 
+import ch.cyberduck.ui.LoginInputValidator;
+
 import org.rococoa.ID;
 import org.rococoa.cocoa.foundation.NSSize;
 
-public abstract class BookmarkContainerController extends SheetController {
+public abstract class BookmarkContainerController extends DefaultBookmarkController {
 
     private final Host bookmark;
-    private final BookmarkController proxy;
 
     /**
      * Container View
@@ -44,32 +46,40 @@ public abstract class BookmarkContainerController extends SheetController {
     @Outlet
     private NSView optionsView;
 
-    public BookmarkContainerController(final Host bookmark, final BookmarkController proxy) {
+    public BookmarkContainerController(final Host bookmark) {
+        super(bookmark);
         this.bookmark = bookmark;
-        this.proxy = proxy;
     }
 
-    @Override
-    public void loadBundle() {
-        proxy.loadBundle();
-        super.loadBundle();
+    public BookmarkContainerController(final Host bookmark, final LoginOptions options) {
+        super(bookmark, options);
+        this.bookmark = bookmark;
+    }
+
+    public BookmarkContainerController(final Host bookmark, final LoginInputValidator validator, final LoginOptions options) {
+        super(bookmark, validator, options);
+        this.bookmark = bookmark;
     }
 
     @Override
     public void awakeFromNib() {
-        proxy.awakeFromNib();
-        proxy.setWindow(window);
-        this.addSubview(containerContentView, proxy.getContentView());
+        super.awakeFromNib();
+        final NSView contentView = this.getContentView();
+        this.addSubview(containerContentView, contentView);
         if(optionsView != null) {
-            final NSView containerOptionsView = proxy.getContainerOptionsView();
+            final NSView containerOptionsView = this.getContainerOptionsView();
             if(containerOptionsView != null) {
                 this.addSubview(containerOptionsView, optionsView);
             }
         }
         this.resize();
-        proxy.focus(window);
-        proxy.addObserver(bookmark -> this.resize());
-        super.awakeFromNib();
+        this.focus(window);
+    }
+
+    @Override
+    public void protocolSelectionChanged(final NSPopUpButton sender) {
+        super.protocolSelectionChanged(sender);
+        this.resize();
     }
 
     private void addSubview(final NSView parent, final NSView subview) {
@@ -113,12 +123,4 @@ protected double getMinWindowWidth() {
     public void helpButtonClicked(final ID sender) {
         BrowserLauncherFactory.get().open(ProviderHelpServiceFactory.get().help(bookmark.getProtocol()));
     }
-
-    public void update() {
-        proxy.update();
-    }
-
-    public void addObserver(final BookmarkController.BookmarkObserver observer) {
-        proxy.addObserver(observer);
-    }
 }

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BookmarkController.java

@@ -16,11 +16,12 @@
  */
 
 import ch.cyberduck.binding.Action;
-import ch.cyberduck.binding.BundleController;
 import ch.cyberduck.binding.Outlet;
+import ch.cyberduck.binding.SheetController;
 import ch.cyberduck.binding.application.*;
 import ch.cyberduck.binding.foundation.NSArray;
 import ch.cyberduck.binding.foundation.NSAttributedString;
+import ch.cyberduck.binding.foundation.NSBundle;
 import ch.cyberduck.binding.foundation.NSData;
 import ch.cyberduck.binding.foundation.NSEnumerator;
 import ch.cyberduck.binding.foundation.NSNotification;
@@ -64,7 +65,7 @@
 import java.util.Set;
 import java.util.TimeZone;
 
-public class BookmarkController extends BundleController implements NSTabView.Delegate {
+public abstract class BookmarkController extends SheetController implements NSTabView.Delegate {
     private static final Logger log = LogManager.getLogger(BookmarkController.class);
 
     private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
@@ -131,8 +132,6 @@ public class BookmarkController extends BundleController implements NSTabView.De
     @Outlet
     private NSButton webUrlImage;
 
-    private NSWindow window;
-
     public BookmarkController(final Host bookmark, final LoginInputValidator validator, final LoginOptions options) {
         this.bookmark = bookmark;
         this.validator = validator;
@@ -146,20 +145,22 @@ public void invalidate() {
     }
 
     @Override
-    protected String getBundleName() {
-        return "Bookmark";
+    public void loadBundle() {
+        if(!NSBundle.loadNibNamed("Bookmark", this.id())) {
+            throw new FactoryException(String.format("Failure loading %s.xib", "Bookmark"));
+        }
+        super.loadBundle();
     }
 
+    @Override
+    protected abstract String getBundleName();
+
     @Override
     public void awakeFromNib() {
         super.awakeFromNib();
         this.update();
     }
 
-    public void setWindow(final NSWindow window) {
-        this.window = window;
-    }
-
     public interface BookmarkObserver {
         void change(final Host bookmark);
     }
@@ -200,7 +201,7 @@ public void setTabView(final NSTabView tabView) {
 
     @Override
     public void tabView_didSelectTabViewItem(final NSTabView view, final NSTabViewItem item) {
-        this.update();
+        this.resize();
     }
 
     public NSView getContentView() {

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/ConnectionController.java

@@ -37,7 +37,7 @@ public ConnectionController(final Host bookmark) {
     }
 
     public ConnectionController(final Host bookmark, final LoginOptions options) {
-        super(bookmark, new DefaultBookmarkController(bookmark, options));
+        super(bookmark, options);
         this.bookmark = bookmark;
         this.options = options;
     }

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/DefaultBookmarkController.java

@@ -25,17 +25,27 @@
 import ch.cyberduck.core.preferences.HostPreferencesFactory;
 import ch.cyberduck.ui.LoginInputValidator;
 
-public class DefaultBookmarkController extends BookmarkController {
+public abstract class DefaultBookmarkController extends BookmarkController {
 
     private final Host bookmark;
     private final LoginOptions options;
 
+    public DefaultBookmarkController(final Host bookmark) {
+        this(bookmark, new LoginOptions(bookmark.getProtocol()));
+    }
+
     public DefaultBookmarkController(final Host bookmark, final LoginOptions options) {
         super(bookmark, new LoginInputValidator(bookmark, options), options);
         this.bookmark = bookmark;
         this.options = options;
     }
 
+    public DefaultBookmarkController(final Host bookmark, final LoginInputValidator validator, final LoginOptions options) {
+        super(bookmark, validator, options);
+        this.bookmark = bookmark;
+        this.options = options;
+    }
+
     @Override
     public void setProtocolPopup(final NSPopUpButton button) {
         button.superview().setHidden(!HostPreferencesFactory.get(bookmark).getBoolean("bookmark.protocol.configurable"));

osx/src/main/java/ch/cyberduck/ui/cocoa/controller/ExtendedBookmarkController.java

@@ -29,7 +29,6 @@
 import ch.cyberduck.core.Local;
 import ch.cyberduck.core.LocalFactory;
 import ch.cyberduck.core.LocaleFactory;
-import ch.cyberduck.core.LoginOptions;
 import ch.cyberduck.core.local.FilesystemBookmarkResolverFactory;
 import ch.cyberduck.core.preferences.HostPreferencesFactory;
 import ch.cyberduck.core.preferences.PreferencesFactory;
@@ -55,7 +54,7 @@ public class ExtendedBookmarkController extends BookmarkContainerController impl
     private NSOpenPanel downloadFolderOpenPanel;
 
     public ExtendedBookmarkController(final Host bookmark) {
-        super(bookmark, new DefaultBookmarkController(bookmark, new LoginOptions(bookmark.getProtocol())));
+        super(bookmark);
         this.bookmark = bookmark;
     }
 
@@ -152,7 +151,7 @@ public void downloadPathPopupClicked(final NSPopUpButton sender) {
             downloadFolderOpenPanel.setCanChooseDirectories(true);
             downloadFolderOpenPanel.setAllowsMultipleSelection(false);
             downloadFolderOpenPanel.setCanCreateDirectories(true);
-            downloadFolderOpenPanel.beginSheetForDirectory(null, null, this.window, this.id(),
+            downloadFolderOpenPanel.beginSheetForDirectory(null, null, window, this.id(),
                     Foundation.selector("downloadPathPanelDidEnd:returnCode:contextInfo:"), null);
         }
         else {