Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-19 01:10:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Last commit broke local storage viewing. Local store never quite "connect"

Browse Source 
so ViewedStoreBase now checks isLocal() if isConnected() fails. Assumption
is that you're always connected if it's a local berkeley store.
This commit is contained in:
grail%cafebabe.org 1999-03-01 05:20:27 +00:00
parent 060260594a
commit dc67188214
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
grendel/view/ViewedStoreBase.java
View File

@ -27,6 +27,7 @@ import javax.mail.AuthenticationFailedException;
import javax.mail.Folder;
import javax.mail.MessagingException;
import javax.mail.Store;
import javax.mail.URLName;
import javax.mail.event.ConnectionEvent;
import javax.mail.event.ConnectionListener;
import javax.mail.event.FolderEvent;
@ -104,6 +105,11 @@ public class ViewedStoreBase extends ViewedFolderBase implements ViewedStore {
return fStore;
}
public boolean isLocal() {
URLName url = fStore.getURLName();
return (url.getProtocol().equals("berkeley"));
}
/**
* Returns the store's default folder wrapped in a ViewedFolder
* object.
@ -112,7 +118,7 @@ public class ViewedStoreBase extends ViewedFolderBase implements ViewedStore {
public ViewedFolder getDefaultFolder() throws MessagingException {
if (fDefaultFolder == null) {
checkConnected();
if (isConnected()) {
if (isConnected() || isLocal()) {
fDefaultFolder = new ViewedFolderBase(this, null,
fStore.getDefaultFolder());
@ -179,9 +185,30 @@ public class ViewedStoreBase extends ViewedFolderBase implements ViewedStore {
fListeners.remove(ViewedStoreListener.class, l);
}
void connectStore() {
try {
if (fStore != null) {
fStore.connect(getHost(), getUsername(), null);
}
} catch (AuthenticationFailedException e) {
JOptionPane.showMessageDialog(null,
// labels.getString("loginFailedLabel"),
// labels.getString("errorDialogLabel"),
"Login failed",
"Grendel Error",
JOptionPane.ERROR_MESSAGE);
} catch (MessagingException e) {
System.out.println("Got exception " + e +
" while connecting to " + this);
e.printStackTrace();
}
}
void checkConnected() throws MessagingException {
if (!isConnected()) {
boolean success = false;
Thread connect = new Thread(new ConnectThread());
connect.start();
success = true;
@ -314,23 +341,7 @@ public class ViewedStoreBase extends ViewedFolderBase implements ViewedStore {
class ConnectThread implements Runnable {
public void run() {
try {
if (fStore != null) {
fStore.connect(getHost(), getUsername(), null);
}
} catch (AuthenticationFailedException e) {
JOptionPane.showMessageDialog(null,
// labels.getString("loginFailedLabel"),
// labels.getString("errorDialogLabel"),
"Login failed",
"Grendel Error",
JOptionPane.ERROR_MESSAGE);
} catch (MessagingException e) {
System.out.println("Got exception " + e +
" while connecting to " + this);
e.printStackTrace();
}
connectStore();
}
}