Skip to content
Browse files

Beta 4.1

  • Loading branch information...
1 parent 63f6ad6 commit 692a9b16abbebb05cc4f627a3df5f5dfbb1a8cc7 @anti43 committed Feb 24, 2013
View
2 src/mpv5/db/common/DatabaseConnection.java
@@ -149,7 +149,7 @@ public boolean reconnect(boolean create) throws SQLException {
stmt.execute(sql);
} catch (SQLException ex) {
Log.Debug(ex);
- result = Popup.OK_dialog("Could not create database " + ConnectionTypeHandler.getDBNAME() + ", did you already create it?", "Database Creation");
+ result = Popup.Y_N_dialog("Could not create database " + ConnectionTypeHandler.getDBNAME() + ", did you already create it?", "Database Creation");
}
}
conn.setCatalog(ConnectionTypeHandler.getDBNAME());
View
2 src/mpv5/globals/Constants.java
@@ -30,7 +30,7 @@
*
* Full Version number
*/
- public static final String VERSION = "Yabs-1.2-Beta4";
+ public static final String VERSION = "Yabs-1.2-Beta4.1";
/**
* The original database version of this release
View
5 src/mpv5/globals/LocalSettings.java
@@ -410,10 +410,13 @@ public static void removeInstance(Integer forConnId) throws Exception {
if (cookies == null) {
cookies = new Vector<PropertyStore>();
}
+ if(forConnId==null){
+ forConnId = 0;
+ }
for (int i = 0; i < cookies.size(); i++) {
PropertyStore propertyStore = cookies.get(i);
- if (propertyStore.getProperty("nodeid").equals(forConnId.toString())) {
+ if (String.valueOf(propertyStore.getProperty("nodeid")).equals(String.valueOf(forConnId))) {
cookies.remove(propertyStore);
}
}
View
2 src/mpv5/ui/dialogs/subcomponents/wizard_DBSettings_1.java
@@ -210,7 +210,7 @@ private void initComponents() {
jLabel3 = new javax.swing.JLabel();
setBackground(new java.awt.Color(255, 255, 255));
- java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("mpv5/resources/languages/Panels"); // NOI18N
+ java.util.ResourceBundle bundle = mpv5.i18n.LanguageManager.getBundle(); // NOI18N
setBorder(javax.swing.BorderFactory.createTitledBorder(bundle.getString("wizard_DBSettings_1.border.title"))); // NOI18N
setName("Form"); // NOI18N
setLayout(new java.awt.BorderLayout());

0 comments on commit 692a9b1

Please sign in to comment.
Something went wrong with that request. Please try again.