diff --git a/.settings/oracle.eclipse.tools.webtier.ui.prefs b/.settings/oracle.eclipse.tools.webtier.ui.prefs new file mode 100644 index 0000000..b0107e5 --- /dev/null +++ b/.settings/oracle.eclipse.tools.webtier.ui.prefs @@ -0,0 +1,5 @@ +_hiddenCategory_\:HTML=false +_hiddenCategory_\:ManagedBeans=false +_hiddenCategory_\:PageVariables=false +_hiddenCategory_\:jsp11=false +eclipse.preferences.version=1 diff --git a/bin/.gitignore b/bin/.gitignore index dd4c872..f7dcbd0 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1 +1,2 @@ /features/ +/database/ diff --git a/src/database/MySQLAccess.java b/src/database/MySQLAccess.java index 741889e..cfa855d 100644 --- a/src/database/MySQLAccess.java +++ b/src/database/MySQLAccess.java @@ -17,7 +17,7 @@ public void connectDB() throws SQLException, ClassNotFoundException { while(resultSet.next()){ String deviceName = resultSet.getString("Device_Name"); String deviceDescription = resultSet.getString("Device_Description"); - String hardwareType = resultSet.getString("Hardware_Type"); + String hardwareType = resultSet.getString("Hardware_Model"); for(int i = 0; i<1; i++){ result[i][0] = deviceName;