RRRRHHHH_Code
Diff Revisions c92b61 ... vs 4bc36b ... for ruralHouses client/src/gui/ModifyOfferGUI.java
| @@ -26,9 +26,9 @@ | |||
| 26 | 26 | import javax.swing.JTextField; | |
| 27 | 27 | ||
| 28 | 28 | import com.toedter.calendar.JCalendar; | |
| 29 | - | ||
| 30 | 29 | import common.HouseInterface; | |
| 31 | 30 | import common.OfferInterface; | |
| 31 | + | ||
| 32 | 32 | import configuration.___IntNames; | |
| 33 | 33 | import domain.Offer; | |
| 34 | 34 | import domain.Owner; | |
| @@ -75,7 +75,6 @@ | |||
| 75 | 75 | this.setSize(new Dimension(513, 433)); | |
| 76 | 76 | this.setTitle("Set availability"); | |
| 77 | 77 | ||
| 78 | - | <<<<<<< HEAD | |
| 79 | 78 | ||
| 80 | 79 | try { | |
| 81 | 80 | om = (OfferInterface) Naming | |
| @@ -90,10 +89,7 @@ | |||
| 90 | 89 | Hlist = hm.getHouses(o, null, null, 0, 0, 0, 0, 0); | |
| 91 | 90 | } catch (RemoteException e1) { | |
| 92 | 91 | e1.printStackTrace(); | |
| 93 | - | } | |
| 94 | - | ======= | |
| 95 | - | >>>>>>> 25898b619dd708c9f15a44200b545cac11404b73 | |
| 96 | - | ||
| 92 | + | } | |
| 97 | 93 | jComboBox1 = new JComboBox<RuralHouse>(Hlist); | |
| 98 | 94 | ||
| 99 | 95 | comboBox_o = new JComboBox<Offer>( | |
| @@ -148,6 +144,7 @@ | |||
| 148 | 144 | ||
| 149 | 145 | @Override | |
| 150 | 146 | public void itemStateChanged(ItemEvent arg0) { | |
| 147 | + | ||
| 151 | 148 | Vector<Offer> vo= null; | |
| 152 | 149 | try { | |
| 153 | 150 | vo = om.getRuralHouseOffers((RuralHouse) jComboBox1.getSelectedItem()); | |
View this file contents
View the full history
Commits for