]> git.mxchange.org Git - addressbook-swing.git/commitdiff
Fixes for broken commit, as type-hints must be fixed or casted
authorRoland Haeder <roland@mxchange.org>
Fri, 31 Jul 2015 09:15:09 +0000 (11:15 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 31 Jul 2015 09:15:09 +0000 (11:15 +0200)
Signed-off-by:Roland Häder <roland@mxchange.org>

Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
Addressbook/src/org/mxchange/addressbook/database/backend/csv/Base64CsvDatabaseBackend.java
Addressbook/src/org/mxchange/addressbook/database/backend/mysql/MySqlDatabaseBackend.java
Addressbook/src/org/mxchange/addressbook/database/frontend/contact/ContactDatabaseFrontend.java

index 1f9db8b75af48612d8bfb7c080282f7c39180b18..c5d05e369d48e87b28da7dbff1ec381509ffebfe 100644 (file)
@@ -404,7 +404,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame
 
                // Only hide it on close and make it appear in middle of screen
                this.addContact.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-               this.addContact.setLocationRelativeTo(null);
+               this.addContact.setLocationRelativeTo(this.frame);
 
                // Set always on top and auto-focus
                this.addContact.setAlwaysOnTop(true);
index c0d84600215005c774970765d5820fa8b6e7cf39..0cfb7eb85b53048b8bc738d69f51f4f7956806bf 100644 (file)
@@ -211,7 +211,7 @@ public class Base64CsvDatabaseBackend extends BaseDatabaseBackend implements Dat
                 * Then read the file into RAM (yes, not perfect for >1000 entries ...)
                 * and get a List back.
                 */
-               List<Storeable> list = this.readList();
+               List<? extends Storeable> list = this.readList();
                
                // List must be set
                assert (list instanceof List) : "list has not been set."; //NOI18N
index abc3e9b2a29b5b77b03fc39ab7d4bf7764741969..da964830cb46c45a269b8c08d437cd4f570bf2a0 100644 (file)
@@ -174,7 +174,7 @@ public class MySqlDatabaseBackend extends BaseDatabaseBackend implements Databas
        }
        
        @Override
-       public Iterator<?> iterator () throws BadTokenException {
+       public Iterator<? extends Storeable> iterator () throws BadTokenException {
                throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
        }
 
index 9731d49d3d1b0ba442983a062c60223fa66e0f44..971dd7d92aa988c50d2dadbc6d78369cd73a5923 100644 (file)
@@ -178,12 +178,12 @@ public class ContactDatabaseFrontend extends BaseDatabaseFrontend implements Con
                boolean isFound = false;
 
                // Start iteration
-               Iterator<Contact> iterator = this.getBackend().iterator();
+               Iterator<? extends Storeable> iterator = this.getBackend().iterator();
 
                // Check all entries
                while (iterator.hasNext()) {
                        // Get next element
-                       Contact c = iterator.next();
+                       Contact c = (Contact) iterator.next();
 
                        // Debug message
                        this.getLogger().debug(MessageFormat.format("c={0},contact={1}", c, contact)); //NOI18N