Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed cache dir, schedule popup

  • Loading branch information...
commit 80b189cb34dca591a90f2037bf39bfc075c704b7 1 parent 46b04e1
@anti43 authored
View
7 src/mpv5/ui/dialogs/ScheduleEvents.java
@@ -39,6 +39,7 @@
import mpv5.utils.models.MPComboboxModel;
import mpv5.utils.models.MPTableModel;
import mpv5.utils.tables.TableFormat;
+import sun.org.mozilla.javascript.internal.ConstProperties;
/**
*
@@ -114,7 +115,6 @@ public void actionPerformed(ActionEvent e) {
}
});
labeledCombobox4.setSearchEnabled(false);
- setAlwaysOnTop(true);
new Position(this);
}
@@ -744,17 +744,20 @@ private void save(Schedule s) {
s.setUsersids(mpv5.db.objects.User.getCurrentUser().__getIDS());
s.setNextdate(DateConverter.addMonths(labeledDateChooser1.getDate(),
s.__getIntervalmonth()));
+ s.setEventtype(1);
s.save();
dataOwner = s;
/*
* Hack um das POPUP ganz nach oben zu bringen ...
*/
+ setAlwaysOnTop(false);
tmp = Popup.identifier;
Popup.identifier = this;
Popup.notice(Messages.SCHEDULE_NEXT
+ DateConverter.getDefDateString(DateConverter.addMonths(labeledDateChooser1.getDate(),
s.__getIntervalmonth())));
Popup.identifier = tmp;
+ setAlwaysOnTop(true);
} else if (jTabbedPane1.getSelectedIndex() == 1) {
if (labeledCombobox3.getSelectedItem() == null) {
Popup.error(this, Messages.SELECT_A_CONTACT.toString());
@@ -786,7 +789,7 @@ private void save(Schedule s) {
s.save();
dataOwner = s;
}
- } catch (NodataFoundException ex) {
+ } catch (Exception ex) {
Log.Debug(this, ex.getMessage());
}
}
View
10 src/mpv5/utils/files/FileDirectoryHandler.java
@@ -571,9 +571,9 @@ public static URI copyFile(File sourceFile, File outp, boolean silent) throws Fi
public static URI copyFile(File sourceFile, File outp) throws FileNotFoundException, IOException {
return copyFile(sourceFile, outp, true);
}
-
- private static void cacheCheck(){
- return cacheCheck(true);
+
+ private static void cacheCheck() {
+ cacheCheck(true);
}
private static void cacheCheck(boolean tryagain) {
@@ -597,8 +597,8 @@ private static void cacheCheck(boolean tryagain) {
} catch (IOException ex) {
Log.Debug(ex);
}
- }else{
- throw new IllegalStateException("Cache dir not writeable: " + String.valueOf(e));
+ } else if ((!e.isDirectory() || !e.canWrite() || e.listFiles() == null)) {
+ throw new IllegalStateException("Cache directory not writeable: " + String.valueOf(e));
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.