Author: ppoddar
Date: Sat Sep 4 04:20:16 2010
New Revision: 992533
URL: http://svn.apache.org/viewvc?rev=992533&view=rev
Log:
Delete redundant classes
Removed:
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/custom/
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/override/org/apache/openjpa/util/
Modified:
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradeHistoryPanel.java
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradingWindow.java
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java
Modified:
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradeHistoryPanel.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradeHistoryPanel.java?rev=992533&r1=992532&r2=992533&view=diff
==============================================================================
---
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradeHistoryPanel.java
(original)
+++
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradeHistoryPanel.java
Sat Sep 4 04:20:16 2010
@@ -28,6 +28,7 @@ import org.apache.openjpa.trader.domain.
import org.apache.openjpa.trader.domain.Trade;
import org.apache.openjpa.trader.domain.Trader;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Widget;
@@ -101,9 +102,10 @@ public class TradeHistoryPanel extends S
*/
public void onTradeCommitted(ServiceEvent.TradeCommitted event) {
Trader trader = session.getTrader();
- if ((trader.equals(event.getPayload().getSeller()) && _type ==
Ask.class)
- || (trader.equals(event.getPayload().getBuyer()) && _type ==
Bid.class)) {
- insert(event.getPayload());
+ Trade trade = event.getPayload();
+ if ((trader.equals(trade.getSeller()) && _type == Ask.class)
+ || (trader.equals(trade.getBuyer()) && _type == Bid.class)) {
+ insert(trade);
}
}
}
Modified:
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradingWindow.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradingWindow.java?rev=992533&r1=992532&r2=992533&view=diff
==============================================================================
---
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradingWindow.java
(original)
+++
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/client/TradingWindow.java
Sat Sep 4 04:20:16 2010
@@ -30,6 +30,7 @@ import org.apache.openjpa.trader.domain.
import org.apache.openjpa.trader.domain.Stock;
import org.apache.openjpa.trader.domain.Tradable;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.Timer;
@@ -63,7 +64,7 @@ public class TradingWindow extends Scrol
ServiceEventHandler.UpdateStockHandler {
private final OpenTrader session;
private Timer refreshTimer;
- private int refreshInterval = 60*1000;
+ private int refreshInterval = 15*1000;
public TradingWindow(final OpenTrader session, final int w, final int h) {
super("Trading Window for " + session.getTrader().getName(), w, h,
true);
@@ -142,14 +143,14 @@ public class TradingWindow extends Scrol
if (refreshTimer != null)
return;
// Setup timer to refresh list automatically.
- Timer refreshTimer = new Timer() {
+ refreshTimer = new Timer() {
@Override
public void run() {
int n = getRowCount();
for (int i = 0; i < n; i++) {
Tradable t = get(i);
if (t != null) {
- session.getService().refresh(t, new
RefreshTradableCallback(t));
+ session.getService().refresh(t, new
RefreshTradableCallback());
}
}
}
@@ -211,7 +212,7 @@ public class TradingWindow extends Scrol
}
public class MatchCallback implements AsyncCallback<List<Match>>,
ClickHandler {
- final Tradable tradable;
+ private final Tradable tradable;
public MatchCallback(Tradable tradable) {
super();
@@ -237,21 +238,12 @@ public class TradingWindow extends Scrol
}
public class RefreshTradableCallback implements AsyncCallback<Tradable> {
- final Tradable tradable;
- public RefreshTradableCallback(Tradable tradable) {
- super();
- this.tradable = tradable;
- }
@Override
public void onSuccess(Tradable result) {
- if (result == null) {
- remove(tradable);
- } else if (result.isTraded()) {
+ if (result.isTraded()) {
remove(result);
session.fireEvent(new
ServiceEvent.TradeCommitted(result.getTrade()));
- } else {
- update(result, new Integer[]{1,4});
}
}
Modified:
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java?rev=992533&r1=992532&r2=992533&view=diff
==============================================================================
---
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java
(original)
+++
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Tradable.java
Sat Sep 4 04:20:16 2010
@@ -71,7 +71,8 @@ public abstract class Tradable implement
@ManyToOne(cascade={CascadeType.MERGE,CascadeType.DETACH,CascadeType.REFRESH},optional=false)
private Stock stock;
- @OneToOne(cascade={CascadeType.MERGE,CascadeType.DETACH}, optional=true,
fetch=FetchType.LAZY)
+ @OneToOne(cascade={CascadeType.MERGE,CascadeType.DETACH,
CascadeType.REFRESH}, optional=true,
+ fetch=FetchType.LAZY)
private Trade trade;
@@ -174,8 +175,6 @@ public abstract class Tradable implement
}
public Trade getTrade() {
- if (trade == null)
- throw new IllegalStateException(this + " is not yet traded");
return trade;
}
@@ -221,8 +220,7 @@ public abstract class Tradable implement
}
public String toString() {
- String type = this.getClass().getName();
- return type.substring(type.lastIndexOf('.'))+ ":" + id;
+ String typeName = getClass().getName();
+ return typeName.substring(typeName.lastIndexOf('.')+1) + "-" + id;
}
-
}
Modified:
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java?rev=992533&r1=992532&r2=992533&view=diff
==============================================================================
---
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java
(original)
+++
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/domain/Trade.java
Sat Sep 4 04:20:16 2010
@@ -44,15 +44,6 @@ public class Trade implements Serializab
private double price;
private int volume;
-// @ManyToOne(cascade={CascadeType.MERGE,CascadeType.DETACH},
optional=false)
-// private Stock stock;
-//
-// @ManyToOne(cascade={CascadeType.MERGE,CascadeType.DETACH},
optional=false)
-// private Trader buyer;
-//
-// @ManyToOne(cascade={CascadeType.MERGE,CascadeType.DETACH},
optional=false)
-// private Trader seller;
-
@OneToOne(cascade={CascadeType.MERGE,CascadeType.DETACH}, optional=false)
private Ask ask;
@@ -78,9 +69,6 @@ public class Trade implements Serializab
throw new IllegalArgumentException("Stock (ask) " + a.getStock()
+ " does not match Stock (bid) " + b.getStock());
}
-// buyer = b.getBuyer();
-// seller = a.getSeller();
-// stock = a.getStock();
ask = a;
bid = b;
ask.setTrade(this);
@@ -137,4 +125,8 @@ public class Trade implements Serializab
return false;
return true;
}
+
+ public String toString() {
+ return "Trade-"+id;
+ }
}
Modified:
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java?rev=992533&r1=992532&r2=992533&view=diff
==============================================================================
---
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java
(original)
+++
openjpa/trunk/openjpa-examples/opentrader/src/main/java/org/apache/openjpa/trader/service/Exchange.java
Sat Sep 4 04:20:16 2010
@@ -125,6 +125,9 @@ public class Exchange extends Persistenc
EntityManager em = getEntityManager();
begin();
t = em.find(t.getClass(), t.getId());
+ if (t != null) {
+ em.refresh(t);
+ }
commit();
return t;
}
