From a82dd674126596a7c86d58bbe70ac797587a7f92 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 31 Jul 2015 11:15:09 +0200
Subject: [PATCH] =?utf8?q?Fixes=20for=20broken=20commit,=20as=20type-hints?=
=?utf8?q?=20must=20be=20fixed=20or=20casted=20Signed-off-by:Roland=20H?=
=?utf8?q?=C3=A4der=20<roland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
.../org/mxchange/addressbook/client/gui/AddressbookFrame.java | 2 +-
.../database/backend/csv/Base64CsvDatabaseBackend.java | 2 +-
.../database/backend/mysql/MySqlDatabaseBackend.java | 2 +-
.../database/frontend/contact/ContactDatabaseFrontend.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
index 1f9db8b7..c5d05e36 100644
--- a/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
+++ b/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java
@@ -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);
diff --git a/Addressbook/src/org/mxchange/addressbook/database/backend/csv/Base64CsvDatabaseBackend.java b/Addressbook/src/org/mxchange/addressbook/database/backend/csv/Base64CsvDatabaseBackend.java
index c0d84600..0cfb7eb8 100644
--- a/Addressbook/src/org/mxchange/addressbook/database/backend/csv/Base64CsvDatabaseBackend.java
+++ b/Addressbook/src/org/mxchange/addressbook/database/backend/csv/Base64CsvDatabaseBackend.java
@@ -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
diff --git a/Addressbook/src/org/mxchange/addressbook/database/backend/mysql/MySqlDatabaseBackend.java b/Addressbook/src/org/mxchange/addressbook/database/backend/mysql/MySqlDatabaseBackend.java
index abc3e9b2..da964830 100644
--- a/Addressbook/src/org/mxchange/addressbook/database/backend/mysql/MySqlDatabaseBackend.java
+++ b/Addressbook/src/org/mxchange/addressbook/database/backend/mysql/MySqlDatabaseBackend.java
@@ -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.
}
diff --git a/Addressbook/src/org/mxchange/addressbook/database/frontend/contact/ContactDatabaseFrontend.java b/Addressbook/src/org/mxchange/addressbook/database/frontend/contact/ContactDatabaseFrontend.java
index 9731d49d..971dd7d9 100644
--- a/Addressbook/src/org/mxchange/addressbook/database/frontend/contact/ContactDatabaseFrontend.java
+++ b/Addressbook/src/org/mxchange/addressbook/database/frontend/contact/ContactDatabaseFrontend.java
@@ -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
--
2.39.5