Changeset 736
- Timestamp:
- 06/22/07 11:17:14 (2 years ago)
- Files:
-
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/META-INF/MANIFEST.MF (modified) (1 diff)
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/plugin.xml (modified) (1 diff)
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/Application.java (modified) (4 diffs)
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/logins/BasicLoginDialog.java (deleted)
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/logins/Connection.java (deleted)
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/logins/ConnectionDetails.java (deleted)
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/logins/GeneralPreferencePage.java (deleted)
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/logins/PreferenceInitializer.java (deleted)
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/models/ItemSession.java (added)
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/models/Session.java (deleted)
- org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/views/ItemView.java (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/META-INF/MANIFEST.MF
r714 r736 7 7 Require-Bundle: org.eclipse.ui, 8 8 org.eclipse.core.runtime, 9 org.eclipse.jface 9 org.eclipse.jface, 10 org.jalcedo.client.login 10 11 Eclipse-LazyStart: true 11 12 Bundle-ClassPath: . org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/plugin.xml
r714 r736 28 28 </view> 29 29 </extension> 30 <extension31 point="org.eclipse.ui.preferencePages">32 <page33 class="org.jalcedo.client.examples.login.logins.GeneralPreferencePage"34 id="org.jalcedo.client.examples.login.general"35 name="General">36 </page>37 </extension>38 30 </plugin> org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/Application.java
r714 r736 1 1 package org.jalcedo.client.examples.login; 2 2 3 4 import java.lang.reflect.InvocationTargetException;5 6 import org.eclipse.core.runtime.IProgressMonitor;7 3 import org.eclipse.core.runtime.Platform; 8 import org.eclipse.core.runtime.Preferences;9 import org.eclipse.core.runtime.preferences.IPreferencesService;10 4 import org.eclipse.equinox.app.IApplication; 11 5 import org.eclipse.equinox.app.IApplicationContext; 12 import org.eclipse.jface.dialogs.ProgressMonitorDialog;13 import org.eclipse.jface.operation.IRunnableWithProgress;14 import org.eclipse.jface.window.Window;15 6 import org.eclipse.swt.widgets.Display; 16 7 import org.eclipse.ui.IWorkbench; 17 8 import org.eclipse.ui.PlatformUI; 18 import org.jalcedo.client.examples.login.logins.BasicLoginDialog; 19 import org.jalcedo.client.examples.login.logins.ConnectionDetails; 20 import org.jalcedo.client.examples.login.logins.GeneralPreferencePage; 21 import org.jalcedo.client.examples.login.models.Session; 22 23 9 import org.jalcedo.client.examples.login.models.ItemSession; 10 import org.jalcedo.client.login.LoginManager; 24 11 25 12 /** … … 27 14 */ 28 15 public class Application implements IApplication { 29 public static final String PLUGIN_ID ="org.jalcedo.client.examples.login"; 16 public static final String PLUGIN_ID = "org.jalcedo.client.examples.login"; 17 30 18 /* 31 19 * (non-Javadoc) … … 37 25 try { 38 26 Platform.endSplash(); 39 if(!login()){ 27 ItemSession itemSession = ItemSession.getInstance(); 28 LoginManager loginManager = new LoginManager(); 29 if (!loginManager.login(itemSession)) { 40 30 return IApplication.EXIT_OK; 41 31 } 42 int returnCode = PlatformUI.createAndRunWorkbench(display,43 new ApplicationWorkbenchAdvisor());44 if (returnCode == PlatformUI.RETURN_RESTART) {45 return IApplication.EXIT_RESTART;46 }47 return IApplication.EXIT_OK;32 int returnCode = PlatformUI.createAndRunWorkbench(display, 33 new ApplicationWorkbenchAdvisor()); 34 if (returnCode == PlatformUI.RETURN_RESTART) { 35 return IApplication.EXIT_RESTART; 36 } 37 return IApplication.EXIT_OK; 48 38 } finally { 49 39 display.dispose(); … … 51 41 } 52 42 53 private boolean login(){54 final Session session = Session.getInstance();55 boolean firstTry = true;56 BasicLoginDialog loginDialog = new BasicLoginDialog(null);57 while (session.getConnection() == null || !session.getConnection().isAuthenticated()) {58 IPreferencesService service = Platform.getPreferencesService();59 boolean auto_login = service.getBoolean(Application.PLUGIN_ID,60 GeneralPreferencePage.AUTO_LOGIN, true, null);61 ConnectionDetails details = loginDialog.getConnectionDetails();62 if (!auto_login || details == null || !firstTry) {63 if (loginDialog.open() != Window.OK) {64 return false;65 }66 details = loginDialog.getConnectionDetails();67 }68 firstTry = false;69 70 session.setConnectionDetails(loginDialog.getConnectionDetails());71 connectWithProgress(session);72 73 }74 75 return true;76 }77 private void connectWithProgress(final Session session) {78 ProgressMonitorDialog progress = new ProgressMonitorDialog(null);79 progress.setCancelable(true);80 81 try {82 progress.run(true, true, new IRunnableWithProgress() {83 84 public void run(IProgressMonitor monitor)85 throws InvocationTargetException, InterruptedException {86 try{87 session.connectAndLogin(monitor);88 }catch (Exception e){89 throw new InvocationTargetException(e);90 }91 }92 93 });94 } catch (InvocationTargetException e) {95 // TODO Auto-generated catch block96 e.printStackTrace();97 } catch (InterruptedException e) {98 // TODO Auto-generated catch block99 e.printStackTrace();100 }101 }102 43 /* 103 44 * (non-Javadoc) org.jalcedo.client.examples/trunk/org.jalcedo.client.examples.loginsample/src/org/jalcedo/client/examples/login/views/ItemView.java
r715 r736 14 14 import org.jalcedo.client.examples.login.models.ItemGroup; 15 15 import org.jalcedo.client.examples.login.models.ItemsListener; 16 import org.jalcedo.client.examples.login.models. Session;16 import org.jalcedo.client.examples.login.models.ItemSession; 17 17 18 18 public class ItemView extends ViewPart { 19 19 public static final String ID = "org.jalcedo.client.examples.login.views.ItemView"; 20 20 private TreeViewer treeViewer; 21 private Session session;21 private ItemSession itemSession; 22 22 private IAdapterFactory adapterFactory = new ItemAdapterFactory(); 23 23 … … 32 32 treeViewer.setLabelProvider(new WorkbenchLabelProvider()); 33 33 treeViewer.setContentProvider(new BaseWorkbenchContentProvider()); 34 treeViewer.setInput( session.getRoot());35 session.getRoot().addItemsListener(new ItemsListener(){34 treeViewer.setInput(itemSession.getRoot()); 35 itemSession.getRoot().addItemsListener(new ItemsListener(){ 36 36 37 37 public void itemChanged(ItemGroup datasource, ItemEntry item) { … … 44 44 45 45 private void initializeSession() { 46 session =Session.getInstance();47 ItemGroup root = session.getRoot();46 itemSession = ItemSession.getInstance(); 47 ItemGroup root = itemSession.getRoot(); 48 48 ItemGroup testGroup = new ItemGroup(root, "Test"); 49 49 root.addItem(testGroup);
