From c6293b326b528da6a2a43ec5667721a8941d32d0 Mon Sep 17 00:00:00 2001 From: Melina Urruchua Date: Sun, 18 Jan 2015 19:15:25 -0300 Subject: [PATCH 1/4] Update Topic 1 -Shopping cart - Audio Player --- Topic1/.classpath | 6 ++ Topic1/.project | 17 ++++ Topic1/.settings/org.eclipse.jdt.core.prefs | 11 +++ Topic1/src/Client.java | 82 ++++++++++++++++ Topic1/src/DemoShopping.java | 16 +++ Topic1/src/IPayStrategy.java | 8 ++ Topic1/src/Item.java | 51 ++++++++++ Topic1/src/ItemAbs.java | 30 ++++++ Topic1/src/Observer.java | 8 ++ Topic1/src/Offer.java | 43 ++++++++ Topic1/src/PayStrategyCash.java | 13 +++ Topic1/src/PayStrategyCreditCard.java | 36 +++++++ Topic1/src/PayStrategyPaypal.java | 36 +++++++ Topic1/src/PayStrategyWDiscount.java | 22 +++++ Topic1/src/Sequence.java | 28 ++++++ Topic1/src/ShoppingCart.java | 98 +++++++++++++++++++ Topic1/src/Subject.java | 10 ++ Topic1/src/discountCheapest.java | 19 ++++ Topic1/src/discountMoreExpensive.java | 19 ++++ Topic1/src/discountPolicy.java | 8 ++ Topic1/src/discountSimple.java | 19 ++++ Topic1/src/marketManager.java | 31 ++++++ Topic1_Audio_Player/.classpath | 6 ++ Topic1_Audio_Player/.project | 17 ++++ .../.settings/org.eclipse.jdt.core.prefs | 11 +++ Topic1_Audio_Player/src/State.java | 4 + Topic1_Audio_Player/src/Strategy.java | 4 + Topic1_Audio_Player/src/pauseState.java | 19 ++++ Topic1_Audio_Player/src/playState.java | 19 ++++ Topic1_Audio_Player/src/playlist.java | 64 ++++++++++++ Topic1_Audio_Player/src/stopState.java | 19 ++++ Topic1_Audio_Player/src/trackContainer.java | 42 ++++++++ Topic1_Audio_Player/src/trackSong.java | 47 +++++++++ 33 files changed, 863 insertions(+) create mode 100644 Topic1/.classpath create mode 100644 Topic1/.project create mode 100644 Topic1/.settings/org.eclipse.jdt.core.prefs create mode 100644 Topic1/src/Client.java create mode 100644 Topic1/src/DemoShopping.java create mode 100644 Topic1/src/IPayStrategy.java create mode 100644 Topic1/src/Item.java create mode 100644 Topic1/src/ItemAbs.java create mode 100644 Topic1/src/Observer.java create mode 100644 Topic1/src/Offer.java create mode 100644 Topic1/src/PayStrategyCash.java create mode 100644 Topic1/src/PayStrategyCreditCard.java create mode 100644 Topic1/src/PayStrategyPaypal.java create mode 100644 Topic1/src/PayStrategyWDiscount.java create mode 100644 Topic1/src/Sequence.java create mode 100644 Topic1/src/ShoppingCart.java create mode 100644 Topic1/src/Subject.java create mode 100644 Topic1/src/discountCheapest.java create mode 100644 Topic1/src/discountMoreExpensive.java create mode 100644 Topic1/src/discountPolicy.java create mode 100644 Topic1/src/discountSimple.java create mode 100644 Topic1/src/marketManager.java create mode 100644 Topic1_Audio_Player/.classpath create mode 100644 Topic1_Audio_Player/.project create mode 100644 Topic1_Audio_Player/.settings/org.eclipse.jdt.core.prefs create mode 100644 Topic1_Audio_Player/src/State.java create mode 100644 Topic1_Audio_Player/src/Strategy.java create mode 100644 Topic1_Audio_Player/src/pauseState.java create mode 100644 Topic1_Audio_Player/src/playState.java create mode 100644 Topic1_Audio_Player/src/playlist.java create mode 100644 Topic1_Audio_Player/src/stopState.java create mode 100644 Topic1_Audio_Player/src/trackContainer.java create mode 100644 Topic1_Audio_Player/src/trackSong.java diff --git a/Topic1/.classpath b/Topic1/.classpath new file mode 100644 index 00000000..fb565a58 --- /dev/null +++ b/Topic1/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/Topic1/.project b/Topic1/.project new file mode 100644 index 00000000..eba98737 --- /dev/null +++ b/Topic1/.project @@ -0,0 +1,17 @@ + + + Topic1 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/Topic1/.settings/org.eclipse.jdt.core.prefs b/Topic1/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..7341ab16 --- /dev/null +++ b/Topic1/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/Topic1/src/Client.java b/Topic1/src/Client.java new file mode 100644 index 00000000..5abe70dd --- /dev/null +++ b/Topic1/src/Client.java @@ -0,0 +1,82 @@ +/** +* @author Melina +* @version 1.0 +*/ + +public class Client { + private String name; + private int creditNumber; + private String email; + private String pass; + + private IPayStrategy strategy; + + private ShoppingCart cart; + + public Client(String name, int creditNumber, String email, String pass) { + this.name=name; + this.creditNumber=creditNumber; + this.email=email; + this.pass=pass; + cart = new ShoppingCart(); + } + + //make the payment transaction + public void payment() { + System.out.println("Payment transaction "); + strategy.pay(cart); + } + + public IPayStrategy getStrategy() { + return strategy; + } + + public void setStrategy(IPayStrategy strategy) { + this.strategy = strategy; + } + + public String showCart() { + return cart.showProducts(); + } + + public void addToCart(Item p) { + this.cart.addProduct(p); + } + + public void removeFromCart(Item p){ + this.cart.removeProduct(p); + } + + public int getCreditNumber() { + return creditNumber; + } + + public void setCreditNumber(int creditNumber) { + this.creditNumber = creditNumber; + } + + public String getPass() { + return pass; + } + + public void setPass(String pass) { + this.pass = pass; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/Topic1/src/DemoShopping.java b/Topic1/src/DemoShopping.java new file mode 100644 index 00000000..23cba9a9 --- /dev/null +++ b/Topic1/src/DemoShopping.java @@ -0,0 +1,16 @@ + +public class DemoShopping { + + public static void main(String[] args) { + Sequence counter = Sequence.getInstance(); + marketManager market = new marketManager(); + Client cliente1= new Client("cliente", 235, "", ""); + + IPayStrategy strategyCreditCard = new PayStrategyCreditCard(cliente1.getName(), cliente1.getCreditNumber()); + discountPolicy discountCreditCard = new discountSimple(10); + cliente1.payment(); + + + } + +} diff --git a/Topic1/src/IPayStrategy.java b/Topic1/src/IPayStrategy.java new file mode 100644 index 00000000..7558d395 --- /dev/null +++ b/Topic1/src/IPayStrategy.java @@ -0,0 +1,8 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +public interface IPayStrategy { + public void pay(ShoppingCart cart); +} diff --git a/Topic1/src/Item.java b/Topic1/src/Item.java new file mode 100644 index 00000000..52adc348 --- /dev/null +++ b/Topic1/src/Item.java @@ -0,0 +1,51 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +import java.util.Hashtable; + + +public class Item extends ItemAbs{ + + private int amount; + private Hashtable feature = new Hashtable(); + + public Item(String name, double cost){ + super(name, cost); + } + + public int getAmount() { + return amount; + } + + public void setAmount(int s){ + this.amount = s; + } + + public Hashtable getFeature() { + return feature; + } + + public void setFeature(Hashtable feature) { + this.feature = feature; + } + + public void addFeature(String s, Object o){ + feature.put(s, o); + } + + public void removeFeature(String s){ + feature.remove(s); + } + + public String showOffer() { + return ("Item " + this.getName() + ".....$" + Double.toString(cost)); + } + + public double getCost() { + return cost; + } + + +} diff --git a/Topic1/src/ItemAbs.java b/Topic1/src/ItemAbs.java new file mode 100644 index 00000000..3dc94533 --- /dev/null +++ b/Topic1/src/ItemAbs.java @@ -0,0 +1,30 @@ +/** +* @author Melina +* @version 1.0 Composite Pattern +*/ + +public abstract class ItemAbs{ + private String name; + protected double cost; + + public ItemAbs(String name, double cost){ + this.setName(name); + this.setCost(cost); + } + + public abstract String showOffer(); + + public abstract double getCost(); + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public void setCost(double cost) { + this.cost = cost; + } +} diff --git a/Topic1/src/Observer.java b/Topic1/src/Observer.java new file mode 100644 index 00000000..e8c0bfdb --- /dev/null +++ b/Topic1/src/Observer.java @@ -0,0 +1,8 @@ +/** +* @author Melina +* @version 1.0 Observer Pattern +*/ + +public interface Observer { + public void update(String g); +} diff --git a/Topic1/src/Offer.java b/Topic1/src/Offer.java new file mode 100644 index 00000000..e80aedc1 --- /dev/null +++ b/Topic1/src/Offer.java @@ -0,0 +1,43 @@ +/** +* @author Melina +* @version 1.0 Composite Pattern +*/ + +import java.util.ArrayList; +import java.util.List; + + +public class Offer extends ItemAbs{ + private List offers = new ArrayList(); + + public Offer(String name, double cost){ + super(name, cost); + } + + public void addOffers(ItemAbs offer) { + this.offers.add(offer); + } + + public void removeOffers(ItemAbs offer) { + this.offers.remove(offer); + } + + public double getCost() { + double price=0; + for (ItemAbs p: offers){ + price += p.getCost(); + } + return price; + } + + @Override + public String showOffer() { + String offer = "Offer " + this.getName() + ".....$" + Double.toString(cost); + String subOffers=null; + for (ItemAbs p: offers){ + subOffers += "Item" + p.getName() + ".....$" + Double.toString(p.getCost()); + } + return offer + subOffers; + } + +} diff --git a/Topic1/src/PayStrategyCash.java b/Topic1/src/PayStrategyCash.java new file mode 100644 index 00000000..32c6ba84 --- /dev/null +++ b/Topic1/src/PayStrategyCash.java @@ -0,0 +1,13 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +public class PayStrategyCash implements IPayStrategy{ + + @Override + public void pay(ShoppingCart cart) { + System.out.println("pay in Cash the corresponding amount: " + cart.getTotalCost()); + } + +} diff --git a/Topic1/src/PayStrategyCreditCard.java b/Topic1/src/PayStrategyCreditCard.java new file mode 100644 index 00000000..51da4e88 --- /dev/null +++ b/Topic1/src/PayStrategyCreditCard.java @@ -0,0 +1,36 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +public class PayStrategyCreditCard implements IPayStrategy{ + private String name; + private int creditNumber; + + public PayStrategyCreditCard(String name, int creditNumber) { + this.setName(name); + this.setCreditNumber(creditNumber); + } + + @Override + public void pay(ShoppingCart cart) { + System.out.println("pay by Credit Card the corresponding amount: " + cart.getTotalCost()); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCreditNumber() { + return creditNumber; + } + + public void setCreditNumber(int creditNumber) { + this.creditNumber = creditNumber; + } + +} diff --git a/Topic1/src/PayStrategyPaypal.java b/Topic1/src/PayStrategyPaypal.java new file mode 100644 index 00000000..3944c713 --- /dev/null +++ b/Topic1/src/PayStrategyPaypal.java @@ -0,0 +1,36 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +public class PayStrategyPaypal implements IPayStrategy{ + private String email; + private String pass; + + public PayStrategyPaypal(String email, String pass) { + this.setEmail(email); + this.setPass(pass); + } + + @Override + public void pay(ShoppingCart cart) { + System.out.println("pay with Paypal the corresponding amount: " + cart.getTotalCost()); + } + + public String getPass() { + return pass; + } + + public void setPass(String pass) { + this.pass = pass; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + +} diff --git a/Topic1/src/PayStrategyWDiscount.java b/Topic1/src/PayStrategyWDiscount.java new file mode 100644 index 00000000..36c3f065 --- /dev/null +++ b/Topic1/src/PayStrategyWDiscount.java @@ -0,0 +1,22 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +public class PayStrategyWDiscount implements IPayStrategy{ + private IPayStrategy strategy; + private discountPolicy discount; + + public PayStrategyWDiscount(IPayStrategy strategy, discountPolicy discount) { + this.strategy=strategy; + this.discount=discount; + } + + @Override + public void pay(ShoppingCart cart) { + strategy.pay(cart); + System.out.println("pay with a discount : " + discount.makeDiscount(cart)); + + } + +} diff --git a/Topic1/src/Sequence.java b/Topic1/src/Sequence.java new file mode 100644 index 00000000..2b8920e5 --- /dev/null +++ b/Topic1/src/Sequence.java @@ -0,0 +1,28 @@ +/** +* @author Melina +* @version 1.0 Sinlgeton Pattern +*/ + +public class Sequence { + private static Sequence instance = null; + private static int counter; + + protected Sequence(){ + counter = 0; + } + + public static Sequence getInstance(){ + if(instance==null) { + instance = new Sequence(); + } + return instance; + } + + public static int getNext(){ + return ++counter; + } + + public int getCounter(){ + return counter; + } +} diff --git a/Topic1/src/ShoppingCart.java b/Topic1/src/ShoppingCart.java new file mode 100644 index 00000000..0d8ad417 --- /dev/null +++ b/Topic1/src/ShoppingCart.java @@ -0,0 +1,98 @@ +import java.util.ArrayList; +import java.util.List; + + +public class ShoppingCart implements Subject{ + private List items = new ArrayList(); + + private List observers = new ArrayList(); + + private Sequence counter = Sequence.getInstance(); + + public ShoppingCart(){ + + } + + public void addProduct(ItemAbs e){ + items.add(e); + this.notify("new Item/Offer added"); //notify when a new offer is added + } + + public void removeProduct(ItemAbs e){ + this.items.remove(e); + } + + public String showProducts(){ + String show = null; + for (ItemAbs p: items){ + show += p.showOffer(); + } + return show; + } + + public ItemAbs mostExpensiveItem(){ + ItemAbs expensive = null; + double cost=0; + for (ItemAbs item: items){ + if (cost < item.getCost()){ + expensive=item; + cost=item.getCost(); + } + } + return expensive; + + } + + public ItemAbs mostCheapestItem(){ + ItemAbs cheapest = null; + double cost=items.get(0).getCost(); + for (ItemAbs item: items){ + if (cost > item.getCost()){ + cheapest=item; + cost=item.getCost(); + } + } + return cheapest; + + } + + public double getTotalCost(){ + double cost=0; + for (ItemAbs item: items){ + double a= item.getCost(); + cost+=a; + } + return cost; + } + + public void changePriceProduct(double price, ItemAbs product){ + product.setCost(price); + this.notify("A price has change: " + product.getName() + "new cost: $" + price); //notify when a price changes + } + + public void payCart(){ + int id= counter.getCounter(); + Sequence.getNext(); + this.notify("A new transaction was made - ID: " + id + "Total cost: $" + this.getTotalCost()); //notify when A new transaction was made + } + + @Override + public void addObserver(Observer o) { + observers.add(o); + } + + @Override + public void removeObserver(Observer o) { + observers.remove(o); + } + + @Override + public void notify(String g) { + System.out.println(g); + for (Observer o: observers){ + o.update(g); + } + } + + +} diff --git a/Topic1/src/Subject.java b/Topic1/src/Subject.java new file mode 100644 index 00000000..736bbea2 --- /dev/null +++ b/Topic1/src/Subject.java @@ -0,0 +1,10 @@ +/** +* @author Melina +* @version 1.0 Observer Pattern +*/ + +public interface Subject { + public void addObserver(Observer o); + public void removeObserver(Observer o); + public void notify(String g); +} diff --git a/Topic1/src/discountCheapest.java b/Topic1/src/discountCheapest.java new file mode 100644 index 00000000..aa79201b --- /dev/null +++ b/Topic1/src/discountCheapest.java @@ -0,0 +1,19 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +public class discountCheapest implements discountPolicy{ + private int percentaje; + + public discountCheapest(int percentaje) { + this.percentaje=percentaje; + } + + @Override + public double makeDiscount(ShoppingCart cart) { + double cost = cart.mostCheapestItem().getCost(); + return cart.getTotalCost() - (cost * percentaje / 100); + } + +} diff --git a/Topic1/src/discountMoreExpensive.java b/Topic1/src/discountMoreExpensive.java new file mode 100644 index 00000000..68e4f82f --- /dev/null +++ b/Topic1/src/discountMoreExpensive.java @@ -0,0 +1,19 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +public class discountMoreExpensive implements discountPolicy{ + private int percentaje; + + public discountMoreExpensive(int percentaje) { + this.percentaje=percentaje; + } + + @Override + public double makeDiscount(ShoppingCart cart) { + double cost = cart.mostExpensiveItem().getCost(); + return cart.getTotalCost() - (cost * percentaje / 100); + } + +} diff --git a/Topic1/src/discountPolicy.java b/Topic1/src/discountPolicy.java new file mode 100644 index 00000000..dbac9d99 --- /dev/null +++ b/Topic1/src/discountPolicy.java @@ -0,0 +1,8 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +public interface discountPolicy { + public double makeDiscount(ShoppingCart cart); +} diff --git a/Topic1/src/discountSimple.java b/Topic1/src/discountSimple.java new file mode 100644 index 00000000..438e119b --- /dev/null +++ b/Topic1/src/discountSimple.java @@ -0,0 +1,19 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +public class discountSimple implements discountPolicy{ + private int percentaje; + + public discountSimple(int percentaje) { + this.percentaje=percentaje; + } + + @Override + public double makeDiscount(ShoppingCart cart) { + double amount = cart.getTotalCost(); + return amount - (amount * percentaje / 100); + } + +} diff --git a/Topic1/src/marketManager.java b/Topic1/src/marketManager.java new file mode 100644 index 00000000..6832ed24 --- /dev/null +++ b/Topic1/src/marketManager.java @@ -0,0 +1,31 @@ +/** +* @author Melina +* @version 1.0 Observer Pattern +*/ + +import java.util.ArrayList; +import java.util.List; + + +public class marketManager implements Observer{ + private List products = new ArrayList(); + private List notice = new ArrayList(); + + public List getProducts() { + return products; + } + + public void addProduct(ItemAbs product) { + this.products.add(product); + } + + public void removeProduct(ItemAbs product) { + this.products.remove(product); + } + + @Override + public void update(String g) { + notice.add(g); + } + +} diff --git a/Topic1_Audio_Player/.classpath b/Topic1_Audio_Player/.classpath new file mode 100644 index 00000000..fb565a58 --- /dev/null +++ b/Topic1_Audio_Player/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/Topic1_Audio_Player/.project b/Topic1_Audio_Player/.project new file mode 100644 index 00000000..215ab5ab --- /dev/null +++ b/Topic1_Audio_Player/.project @@ -0,0 +1,17 @@ + + + Topic1_Audio_Player + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/Topic1_Audio_Player/.settings/org.eclipse.jdt.core.prefs b/Topic1_Audio_Player/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..7341ab16 --- /dev/null +++ b/Topic1_Audio_Player/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/Topic1_Audio_Player/src/State.java b/Topic1_Audio_Player/src/State.java new file mode 100644 index 00000000..c92122ad --- /dev/null +++ b/Topic1_Audio_Player/src/State.java @@ -0,0 +1,4 @@ + +public interface State { + public void goNext(playlist p,String nextstate); +} diff --git a/Topic1_Audio_Player/src/Strategy.java b/Topic1_Audio_Player/src/Strategy.java new file mode 100644 index 00000000..ec65d2ea --- /dev/null +++ b/Topic1_Audio_Player/src/Strategy.java @@ -0,0 +1,4 @@ + +public interface Strategy { + public void filterSong(playlist list); +} diff --git a/Topic1_Audio_Player/src/pauseState.java b/Topic1_Audio_Player/src/pauseState.java new file mode 100644 index 00000000..2c020f3c --- /dev/null +++ b/Topic1_Audio_Player/src/pauseState.java @@ -0,0 +1,19 @@ + +public class pauseState implements State{ + String current = "pause"; + + @Override + public void goNext(playlist p,String nextstate) { + if("play".equals(nextstate)){ + State playstate = new playState(); + p.setState(playstate); + System.out.println("Play mode: " + p.getCurrentSong()); + } + else{ + State stopstate = new stopState(); + p.setState(stopstate); + System.out.println("Stop mode."); + } + } + +} diff --git a/Topic1_Audio_Player/src/playState.java b/Topic1_Audio_Player/src/playState.java new file mode 100644 index 00000000..782dca38 --- /dev/null +++ b/Topic1_Audio_Player/src/playState.java @@ -0,0 +1,19 @@ + +public class playState implements State{ + String current = "play"; + + @Override + public void goNext(playlist p,String nextstate) { + if("pause".equals(nextstate)){ + State pausestate = new pauseState(); + p.setState(pausestate); + System.out.println("Pause mode."); + } + else{ + State stopstate = new stopState(); + p.setState(stopstate); + System.out.println("Stop mode."); + } + } + +} diff --git a/Topic1_Audio_Player/src/playlist.java b/Topic1_Audio_Player/src/playlist.java new file mode 100644 index 00000000..e7a3bdb9 --- /dev/null +++ b/Topic1_Audio_Player/src/playlist.java @@ -0,0 +1,64 @@ +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + + +public class playlist extends trackContainer{ + private State state; + + private List songs= new ArrayList(); + + private String currentSong; + + public playlist(String name) { + super(name); + } + + public void addTrack(trackSong track){ + songs.add(track); + } + + public void goNext(String nextstate){ + state.goNext(this,nextstate); + } + + public void setState(State s){ + this.state=s; + } + + public void reproduction() throws InterruptedException{ + boolean on=true; + while (on){ + boolean onrandom=true; + Iterator it = songs.iterator(); + while (it.hasNext() && on) { + trackSong track = it.next(); + currentSong=track.getName(); + while (onrandom){ + int r= (int) Math.random(); + if (r<3){ + goNext("pause"); + wait(100); + } + else if (r>7){ + goNext("stop"); + wait(100); + } + else if (r==5){ + onrandom=false; + } + else wait(track.getDurationInSec()); + } + int exit= (int) Math.random(); + if (exit<5) on=false; + } + + } + System.out.println("End Playing"); + } + + public String getCurrentSong() { + return currentSong; + } + +} diff --git a/Topic1_Audio_Player/src/stopState.java b/Topic1_Audio_Player/src/stopState.java new file mode 100644 index 00000000..0a4e886e --- /dev/null +++ b/Topic1_Audio_Player/src/stopState.java @@ -0,0 +1,19 @@ + +public class stopState implements State{ + String current = "stop"; + + @Override + public void goNext(playlist p,String nextstate) { + if("pause".equals(nextstate)){ + State pausestate = new pauseState(); + p.setState(pausestate); + System.out.println("Pause mode."); + } + else{ + State playstate = new playState(); + p.setState(playstate); + System.out.println("Play mode: " + p.getCurrentSong()); + } + } + +} diff --git a/Topic1_Audio_Player/src/trackContainer.java b/Topic1_Audio_Player/src/trackContainer.java new file mode 100644 index 00000000..0dfa3ac4 --- /dev/null +++ b/Topic1_Audio_Player/src/trackContainer.java @@ -0,0 +1,42 @@ +import java.util.ArrayList; +import java.util.List; + + +public class trackContainer { + private String name; + protected int totalTimeInSec; + protected List songs= new ArrayList(); + + public trackContainer(String name){ + this.name=name; + this.totalTimeInSec=0; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getTotalTimeInSec(){ + for (trackSong song: songs){ + totalTimeInSec+=song.getDurationInSec(); + } + return totalTimeInSec; + } + + public void setTotalTimeInSec(int totalTimeInSec) { + this.totalTimeInSec = totalTimeInSec; + } + + public void addTrack(trackSong track){ + songs.add(track); + } + + public void removeTrack(trackSong track){ + songs.remove(track); + } + +} diff --git a/Topic1_Audio_Player/src/trackSong.java b/Topic1_Audio_Player/src/trackSong.java new file mode 100644 index 00000000..9d38c525 --- /dev/null +++ b/Topic1_Audio_Player/src/trackSong.java @@ -0,0 +1,47 @@ + +public class trackSong { + private String name; + private String author; + private int durationInSec; + private String album; + + public trackSong(String name,String author,int durationInSec,String album){ + this.setName(name); + this.setAuthor(author); + this.setDurationInSec(durationInSec); + this.setAlbum(album); + } + + public int getDurationInSec() { + return durationInSec; + } + + public void setDurationInSec(int durationInSec) { + this.durationInSec = durationInSec; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAlbum() { + return album; + } + + public void setAlbum(String album) { + this.album = album; + } + +} From 8bd8afcd83397760ea16d2aa5e25d57c87c8c6a4 Mon Sep 17 00:00:00 2001 From: Melina Urruchua Date: Tue, 20 Jan 2015 17:34:06 -0300 Subject: [PATCH 2/4] updating after feedback --- Topic1/src/Client.java | 47 ++++++++-------- Topic1/src/DemoShopping.java | 9 ++-- ...untCheapest.java => DiscountCheapest.java} | 7 +-- ...ensive.java => DiscountMoreExpensive.java} | 7 +-- Topic1/src/DiscountPolicy.java | 8 +++ ...iscountSimple.java => DiscountSimple.java} | 9 ++-- Topic1/src/IOffer.java | 15 ++++++ Topic1/src/IPayStrategy.java | 2 +- Topic1/src/Item.java | 28 +++++++--- Topic1/src/ItemAbs.java | 30 ----------- Topic1/src/MarketManager.java | 45 ++++++++++++++++ Topic1/src/Offer.java | 35 +++++++++--- Topic1/src/PayStrategyCash.java | 11 +++- Topic1/src/PayStrategyCreditCard.java | 11 ++-- Topic1/src/PayStrategyPaypal.java | 11 ++-- Topic1/src/PayStrategyWDiscount.java | 22 -------- Topic1/src/Sequence.java | 4 +- Topic1/src/ShoppingCart.java | 53 +++++++++++++------ Topic1/src/discountPolicy.java | 8 --- Topic1/src/marketManager.java | 31 ----------- .../src/{pauseState.java => PauseState.java} | 0 .../src/{playState.java => PlayState.java} | 0 .../src/{playlist.java => Playlist.java} | 0 .../src/{stopState.java => StopState.java} | 0 ...rackContainer.java => TrackContainer.java} | 0 .../src/{trackSong.java => TrackSong.java} | 0 26 files changed, 225 insertions(+), 168 deletions(-) rename Topic1/src/{discountCheapest.java => DiscountCheapest.java} (51%) rename Topic1/src/{discountMoreExpensive.java => DiscountMoreExpensive.java} (50%) create mode 100644 Topic1/src/DiscountPolicy.java rename Topic1/src/{discountSimple.java => DiscountSimple.java} (51%) create mode 100644 Topic1/src/IOffer.java delete mode 100644 Topic1/src/ItemAbs.java create mode 100644 Topic1/src/MarketManager.java delete mode 100644 Topic1/src/PayStrategyWDiscount.java delete mode 100644 Topic1/src/discountPolicy.java delete mode 100644 Topic1/src/marketManager.java rename Topic1_Audio_Player/src/{pauseState.java => PauseState.java} (100%) rename Topic1_Audio_Player/src/{playState.java => PlayState.java} (100%) rename Topic1_Audio_Player/src/{playlist.java => Playlist.java} (100%) rename Topic1_Audio_Player/src/{stopState.java => StopState.java} (100%) rename Topic1_Audio_Player/src/{trackContainer.java => TrackContainer.java} (100%) rename Topic1_Audio_Player/src/{trackSong.java => TrackSong.java} (100%) diff --git a/Topic1/src/Client.java b/Topic1/src/Client.java index 5abe70dd..52f50100 100644 --- a/Topic1/src/Client.java +++ b/Topic1/src/Client.java @@ -1,3 +1,6 @@ +import java.util.ArrayList; +import java.util.List; + /** * @author Melina * @version 1.0 @@ -8,43 +11,37 @@ public class Client { private int creditNumber; private String email; private String pass; - - private IPayStrategy strategy; - - private ShoppingCart cart; + + private List carts; public Client(String name, int creditNumber, String email, String pass) { this.name=name; this.creditNumber=creditNumber; this.email=email; this.pass=pass; - cart = new ShoppingCart(); + carts=new ArrayList(); } //make the payment transaction - public void payment() { + public void payment(int c) { System.out.println("Payment transaction "); - strategy.pay(cart); + carts.get(c).payCart();; } - public IPayStrategy getStrategy() { - return strategy; - } - - public void setStrategy(IPayStrategy strategy) { - this.strategy = strategy; + public String showCart(String idCart) { + for (ShoppingCart cart: carts){ + if (idCart.equals(cart.getIdCart())) + return cart.showProducts(); + } + return null; } - public String showCart() { - return cart.showProducts(); - } - - public void addToCart(Item p) { - this.cart.addProduct(p); + public void addToCart(int c,IOffer p) { + carts.get(c).addProduct(p); } - public void removeFromCart(Item p){ - this.cart.removeProduct(p); + public void removeFromCart(int c,IOffer p){ + carts.get(c).removeProduct(p); } public int getCreditNumber() { @@ -78,5 +75,13 @@ public String getName() { public void setName(String name) { this.name = name; } + + public ShoppingCart getCart(int i) { + return carts.get(i); + } + + public void addCart(ShoppingCart cart) { + carts.add(cart); + } } diff --git a/Topic1/src/DemoShopping.java b/Topic1/src/DemoShopping.java index 23cba9a9..e6f9ab44 100644 --- a/Topic1/src/DemoShopping.java +++ b/Topic1/src/DemoShopping.java @@ -3,12 +3,13 @@ public class DemoShopping { public static void main(String[] args) { Sequence counter = Sequence.getInstance(); - marketManager market = new marketManager(); + MarketManager market; Client cliente1= new Client("cliente", 235, "", ""); - IPayStrategy strategyCreditCard = new PayStrategyCreditCard(cliente1.getName(), cliente1.getCreditNumber()); - discountPolicy discountCreditCard = new discountSimple(10); - cliente1.payment(); + DiscountPolicy discountCreditCard = new DiscountSimple(10); + IPayStrategy strategyCreditCard = new PayStrategyCreditCard(cliente1.getName(), cliente1.getCreditNumber(),discountCreditCard); + + cliente1.addCart(null); } diff --git a/Topic1/src/discountCheapest.java b/Topic1/src/DiscountCheapest.java similarity index 51% rename from Topic1/src/discountCheapest.java rename to Topic1/src/DiscountCheapest.java index aa79201b..d0cd2241 100644 --- a/Topic1/src/discountCheapest.java +++ b/Topic1/src/DiscountCheapest.java @@ -3,15 +3,16 @@ * @version 1.0 Strategy Pattern */ -public class discountCheapest implements discountPolicy{ +public class DiscountCheapest implements DiscountPolicy{ private int percentaje; - public discountCheapest(int percentaje) { + public DiscountCheapest(int percentaje) { this.percentaje=percentaje; } @Override - public double makeDiscount(ShoppingCart cart) { + public double applyDiscount(ShoppingCart cart) { + System.out.println("apply discount " + percentaje + "% to the cheapest item."); double cost = cart.mostCheapestItem().getCost(); return cart.getTotalCost() - (cost * percentaje / 100); } diff --git a/Topic1/src/discountMoreExpensive.java b/Topic1/src/DiscountMoreExpensive.java similarity index 50% rename from Topic1/src/discountMoreExpensive.java rename to Topic1/src/DiscountMoreExpensive.java index 68e4f82f..1fd37828 100644 --- a/Topic1/src/discountMoreExpensive.java +++ b/Topic1/src/DiscountMoreExpensive.java @@ -3,15 +3,16 @@ * @version 1.0 Strategy Pattern */ -public class discountMoreExpensive implements discountPolicy{ +public class DiscountMoreExpensive implements DiscountPolicy{ private int percentaje; - public discountMoreExpensive(int percentaje) { + public DiscountMoreExpensive(int percentaje) { this.percentaje=percentaje; } @Override - public double makeDiscount(ShoppingCart cart) { + public double applyDiscount(ShoppingCart cart) { + System.out.println("apply discount " + percentaje + "% to the more expensive item."); double cost = cart.mostExpensiveItem().getCost(); return cart.getTotalCost() - (cost * percentaje / 100); } diff --git a/Topic1/src/DiscountPolicy.java b/Topic1/src/DiscountPolicy.java new file mode 100644 index 00000000..ecf7beed --- /dev/null +++ b/Topic1/src/DiscountPolicy.java @@ -0,0 +1,8 @@ +/** +* @author Melina +* @version 1.0 Strategy Pattern +*/ + +public interface DiscountPolicy { + public double applyDiscount(ShoppingCart cart); +} diff --git a/Topic1/src/discountSimple.java b/Topic1/src/DiscountSimple.java similarity index 51% rename from Topic1/src/discountSimple.java rename to Topic1/src/DiscountSimple.java index 438e119b..91e5fcf4 100644 --- a/Topic1/src/discountSimple.java +++ b/Topic1/src/DiscountSimple.java @@ -3,15 +3,16 @@ * @version 1.0 Strategy Pattern */ -public class discountSimple implements discountPolicy{ +public class DiscountSimple implements DiscountPolicy{ private int percentaje; - public discountSimple(int percentaje) { + public DiscountSimple(int percentaje) { this.percentaje=percentaje; } - + @Override - public double makeDiscount(ShoppingCart cart) { + public double applyDiscount(ShoppingCart cart) { + System.out.println("apply discount " + percentaje + "%."); double amount = cart.getTotalCost(); return amount - (amount * percentaje / 100); } diff --git a/Topic1/src/IOffer.java b/Topic1/src/IOffer.java new file mode 100644 index 00000000..88f06e5a --- /dev/null +++ b/Topic1/src/IOffer.java @@ -0,0 +1,15 @@ +/** +* @author Melina +* @version 1.0 Composite Pattern +*/ + +public interface IOffer{ + public String getName(); + + public String showOffer(); + + public double getCost(); + + public void setCost(double price); + +} diff --git a/Topic1/src/IPayStrategy.java b/Topic1/src/IPayStrategy.java index 7558d395..16c2a6e2 100644 --- a/Topic1/src/IPayStrategy.java +++ b/Topic1/src/IPayStrategy.java @@ -4,5 +4,5 @@ */ public interface IPayStrategy { - public void pay(ShoppingCart cart); + public double pay(ShoppingCart cart); } diff --git a/Topic1/src/Item.java b/Topic1/src/Item.java index 52adc348..4c7f060d 100644 --- a/Topic1/src/Item.java +++ b/Topic1/src/Item.java @@ -4,15 +4,19 @@ */ import java.util.Hashtable; +import java.util.Map; -public class Item extends ItemAbs{ +public class Item implements IOffer{ + private String name; + private double cost; private int amount; - private Hashtable feature = new Hashtable(); + private Map feature = new Hashtable(); public Item(String name, double cost){ - super(name, cost); + this.name=name; + this.cost=cost; } public int getAmount() { @@ -23,11 +27,11 @@ public void setAmount(int s){ this.amount = s; } - public Hashtable getFeature() { + public Map getFeature() { return feature; } - public void setFeature(Hashtable feature) { + public void setFeature(Map feature) { this.feature = feature; } @@ -46,6 +50,16 @@ public String showOffer() { public double getCost() { return cost; } - - + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public void setCost(double cost) { + this.cost = cost; + } } diff --git a/Topic1/src/ItemAbs.java b/Topic1/src/ItemAbs.java deleted file mode 100644 index 3dc94533..00000000 --- a/Topic1/src/ItemAbs.java +++ /dev/null @@ -1,30 +0,0 @@ -/** -* @author Melina -* @version 1.0 Composite Pattern -*/ - -public abstract class ItemAbs{ - private String name; - protected double cost; - - public ItemAbs(String name, double cost){ - this.setName(name); - this.setCost(cost); - } - - public abstract String showOffer(); - - public abstract double getCost(); - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public void setCost(double cost) { - this.cost = cost; - } -} diff --git a/Topic1/src/MarketManager.java b/Topic1/src/MarketManager.java new file mode 100644 index 00000000..0470605a --- /dev/null +++ b/Topic1/src/MarketManager.java @@ -0,0 +1,45 @@ +/** +* @author Melina +* @version 1.0 Observer Pattern +*/ + +import java.util.ArrayList; +import java.util.List; + + +public class MarketManager implements Observer{ + private static MarketManager instance = null; + + private List products = new ArrayList(); + private List notice = new ArrayList(); + + private MarketManager() { + + } + + public List getProducts() { + return products; + } + + public void addProduct(IOffer product) { + this.products.add(product); + } + + public void removeProduct(IOffer product) { + this.products.remove(product); + } + + @Override + public void update(String g) { + notice.add(g); + } + + public MarketManager getInstance() { + if(instance==null) { + instance = new MarketManager(); + } + return instance; + } + + +} diff --git a/Topic1/src/Offer.java b/Topic1/src/Offer.java index e80aedc1..af0fba72 100644 --- a/Topic1/src/Offer.java +++ b/Topic1/src/Offer.java @@ -7,24 +7,27 @@ import java.util.List; -public class Offer extends ItemAbs{ - private List offers = new ArrayList(); +public class Offer implements IOffer{ + private String name; + private double cost; + private List offers = new ArrayList(); public Offer(String name, double cost){ - super(name, cost); + this.name=name; + this.cost=cost; } - public void addOffers(ItemAbs offer) { + public void addOffers(IOffer offer) { this.offers.add(offer); } - public void removeOffers(ItemAbs offer) { + public void removeOffers(IOffer offer) { this.offers.remove(offer); } - public double getCost() { + public double getRealCost() { double price=0; - for (ItemAbs p: offers){ + for (IOffer p: offers){ price += p.getCost(); } return price; @@ -34,10 +37,26 @@ public double getCost() { public String showOffer() { String offer = "Offer " + this.getName() + ".....$" + Double.toString(cost); String subOffers=null; - for (ItemAbs p: offers){ + for (IOffer p: offers){ subOffers += "Item" + p.getName() + ".....$" + Double.toString(p.getCost()); } return offer + subOffers; } + public double getCost() { + return cost; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public void setCost(double cost) { + this.cost = cost; + } + } diff --git a/Topic1/src/PayStrategyCash.java b/Topic1/src/PayStrategyCash.java index 32c6ba84..e0ff7fd0 100644 --- a/Topic1/src/PayStrategyCash.java +++ b/Topic1/src/PayStrategyCash.java @@ -4,10 +4,17 @@ */ public class PayStrategyCash implements IPayStrategy{ + private DiscountMoreExpensive discount; + + public PayStrategyCash(DiscountPolicy discount) { + this.discount=(DiscountMoreExpensive) discount; + } @Override - public void pay(ShoppingCart cart) { - System.out.println("pay in Cash the corresponding amount: " + cart.getTotalCost()); + public double pay(ShoppingCart cart) { + double d=discount.applyDiscount(cart); + System.out.println("pay in Cash the corresponding amount: " + d); + return d; } } diff --git a/Topic1/src/PayStrategyCreditCard.java b/Topic1/src/PayStrategyCreditCard.java index 51da4e88..044485e7 100644 --- a/Topic1/src/PayStrategyCreditCard.java +++ b/Topic1/src/PayStrategyCreditCard.java @@ -7,14 +7,19 @@ public class PayStrategyCreditCard implements IPayStrategy{ private String name; private int creditNumber; - public PayStrategyCreditCard(String name, int creditNumber) { + private DiscountSimple discount; + + public PayStrategyCreditCard(String name, int creditNumber,DiscountPolicy discountCreditCard) { this.setName(name); this.setCreditNumber(creditNumber); + this.discount=(DiscountSimple) discountCreditCard; } @Override - public void pay(ShoppingCart cart) { - System.out.println("pay by Credit Card the corresponding amount: " + cart.getTotalCost()); + public double pay(ShoppingCart cart) { + double d=discount.applyDiscount(cart); + System.out.println("pay by Credit Card the corresponding amount: " + d); + return d; } public String getName() { diff --git a/Topic1/src/PayStrategyPaypal.java b/Topic1/src/PayStrategyPaypal.java index 3944c713..54a39038 100644 --- a/Topic1/src/PayStrategyPaypal.java +++ b/Topic1/src/PayStrategyPaypal.java @@ -7,14 +7,19 @@ public class PayStrategyPaypal implements IPayStrategy{ private String email; private String pass; - public PayStrategyPaypal(String email, String pass) { + private DiscountCheapest discount; + + public PayStrategyPaypal(String email, String pass,DiscountPolicy discount) { this.setEmail(email); this.setPass(pass); + this.discount=(DiscountCheapest) discount; } @Override - public void pay(ShoppingCart cart) { - System.out.println("pay with Paypal the corresponding amount: " + cart.getTotalCost()); + public double pay(ShoppingCart cart) { + double d=discount.applyDiscount(cart); + System.out.println("pay with Paypal the corresponding amount: " + d); + return d; } public String getPass() { diff --git a/Topic1/src/PayStrategyWDiscount.java b/Topic1/src/PayStrategyWDiscount.java deleted file mode 100644 index 36c3f065..00000000 --- a/Topic1/src/PayStrategyWDiscount.java +++ /dev/null @@ -1,22 +0,0 @@ -/** -* @author Melina -* @version 1.0 Strategy Pattern -*/ - -public class PayStrategyWDiscount implements IPayStrategy{ - private IPayStrategy strategy; - private discountPolicy discount; - - public PayStrategyWDiscount(IPayStrategy strategy, discountPolicy discount) { - this.strategy=strategy; - this.discount=discount; - } - - @Override - public void pay(ShoppingCart cart) { - strategy.pay(cart); - System.out.println("pay with a discount : " + discount.makeDiscount(cart)); - - } - -} diff --git a/Topic1/src/Sequence.java b/Topic1/src/Sequence.java index 2b8920e5..23551a47 100644 --- a/Topic1/src/Sequence.java +++ b/Topic1/src/Sequence.java @@ -7,7 +7,7 @@ public class Sequence { private static Sequence instance = null; private static int counter; - protected Sequence(){ + private Sequence(){ counter = 0; } @@ -18,7 +18,7 @@ public static Sequence getInstance(){ return instance; } - public static int getNext(){ + public int getNext(){ return ++counter; } diff --git a/Topic1/src/ShoppingCart.java b/Topic1/src/ShoppingCart.java index 0d8ad417..1a59f083 100644 --- a/Topic1/src/ShoppingCart.java +++ b/Topic1/src/ShoppingCart.java @@ -3,37 +3,49 @@ public class ShoppingCart implements Subject{ - private List items = new ArrayList(); + private String IdCart; + private List items = new ArrayList(); + + private IPayStrategy strategy; //Pay Strategy private List observers = new ArrayList(); private Sequence counter = Sequence.getInstance(); - public ShoppingCart(){ - + public ShoppingCart(String id,MarketManager m){ + setIdCart(id); + addObserver(m.getInstance()); //add observer } - public void addProduct(ItemAbs e){ + public void addProduct(IOffer e){ items.add(e); this.notify("new Item/Offer added"); //notify when a new offer is added } - public void removeProduct(ItemAbs e){ + public void removeProduct(IOffer e){ this.items.remove(e); } public String showProducts(){ String show = null; - for (ItemAbs p: items){ + for (IOffer p: items){ show += p.showOffer(); } return show; } - public ItemAbs mostExpensiveItem(){ - ItemAbs expensive = null; + public IPayStrategy getStrategy() { + return strategy; + } + + public void setStrategy(IPayStrategy strategy) { + this.strategy = strategy; + } + + public IOffer mostExpensiveItem(){ + IOffer expensive = null; double cost=0; - for (ItemAbs item: items){ + for (IOffer item: items){ if (cost < item.getCost()){ expensive=item; cost=item.getCost(); @@ -43,10 +55,10 @@ public ItemAbs mostExpensiveItem(){ } - public ItemAbs mostCheapestItem(){ - ItemAbs cheapest = null; + public IOffer mostCheapestItem(){ + IOffer cheapest = null; double cost=items.get(0).getCost(); - for (ItemAbs item: items){ + for (IOffer item: items){ if (cost > item.getCost()){ cheapest=item; cost=item.getCost(); @@ -58,22 +70,23 @@ public ItemAbs mostCheapestItem(){ public double getTotalCost(){ double cost=0; - for (ItemAbs item: items){ + for (IOffer item: items){ double a= item.getCost(); cost+=a; } return cost; } - public void changePriceProduct(double price, ItemAbs product){ + public void changePriceProduct(double price, IOffer product){ product.setCost(price); this.notify("A price has change: " + product.getName() + "new cost: $" + price); //notify when a price changes } public void payCart(){ int id= counter.getCounter(); - Sequence.getNext(); - this.notify("A new transaction was made - ID: " + id + "Total cost: $" + this.getTotalCost()); //notify when A new transaction was made + counter.getNext(); + double total=strategy.pay(this); //pay and apply discount + this.notify("A new transaction was made - ID: " + id + "Total cost: $" + total); //notify when A new transaction was made } @Override @@ -94,5 +107,13 @@ public void notify(String g) { } } + public String getIdCart() { + return IdCart; + } + + public void setIdCart(String idCart) { + IdCart = idCart; + } + } diff --git a/Topic1/src/discountPolicy.java b/Topic1/src/discountPolicy.java deleted file mode 100644 index dbac9d99..00000000 --- a/Topic1/src/discountPolicy.java +++ /dev/null @@ -1,8 +0,0 @@ -/** -* @author Melina -* @version 1.0 Strategy Pattern -*/ - -public interface discountPolicy { - public double makeDiscount(ShoppingCart cart); -} diff --git a/Topic1/src/marketManager.java b/Topic1/src/marketManager.java deleted file mode 100644 index 6832ed24..00000000 --- a/Topic1/src/marketManager.java +++ /dev/null @@ -1,31 +0,0 @@ -/** -* @author Melina -* @version 1.0 Observer Pattern -*/ - -import java.util.ArrayList; -import java.util.List; - - -public class marketManager implements Observer{ - private List products = new ArrayList(); - private List notice = new ArrayList(); - - public List getProducts() { - return products; - } - - public void addProduct(ItemAbs product) { - this.products.add(product); - } - - public void removeProduct(ItemAbs product) { - this.products.remove(product); - } - - @Override - public void update(String g) { - notice.add(g); - } - -} diff --git a/Topic1_Audio_Player/src/pauseState.java b/Topic1_Audio_Player/src/PauseState.java similarity index 100% rename from Topic1_Audio_Player/src/pauseState.java rename to Topic1_Audio_Player/src/PauseState.java diff --git a/Topic1_Audio_Player/src/playState.java b/Topic1_Audio_Player/src/PlayState.java similarity index 100% rename from Topic1_Audio_Player/src/playState.java rename to Topic1_Audio_Player/src/PlayState.java diff --git a/Topic1_Audio_Player/src/playlist.java b/Topic1_Audio_Player/src/Playlist.java similarity index 100% rename from Topic1_Audio_Player/src/playlist.java rename to Topic1_Audio_Player/src/Playlist.java diff --git a/Topic1_Audio_Player/src/stopState.java b/Topic1_Audio_Player/src/StopState.java similarity index 100% rename from Topic1_Audio_Player/src/stopState.java rename to Topic1_Audio_Player/src/StopState.java diff --git a/Topic1_Audio_Player/src/trackContainer.java b/Topic1_Audio_Player/src/TrackContainer.java similarity index 100% rename from Topic1_Audio_Player/src/trackContainer.java rename to Topic1_Audio_Player/src/TrackContainer.java diff --git a/Topic1_Audio_Player/src/trackSong.java b/Topic1_Audio_Player/src/TrackSong.java similarity index 100% rename from Topic1_Audio_Player/src/trackSong.java rename to Topic1_Audio_Player/src/TrackSong.java From 03128e3d9977d0aaa9c8ff959412cab1edeac99e Mon Sep 17 00:00:00 2001 From: Melina Urruchua Date: Wed, 21 Jan 2015 20:31:33 -0300 Subject: [PATCH 3/4] update Maven Topic 2 --- Maven/my-app/.classpath | 8 + Maven/my-app/.project | 14 + Maven/my-app/pom.xml | 24 + .../src/main/java/com/mycompany/app/App.java | 13 + .../test/java/com/mycompany/app/AppTest.java | 38 + .../target/maven-archiver/pom.properties | 5 + .../compile/default-compile/createdFiles.lst | 1 + .../compile/default-compile/inputFiles.lst | 1 + .../default-testCompile/createdFiles.lst | 1 + .../default-testCompile/inputFiles.lst | 1 + Maven/my-app/target/site/css/maven-base.css | 155 ++ Maven/my-app/target/site/css/maven-theme.css | 141 ++ Maven/my-app/target/site/css/print.css | 7 + Maven/my-app/target/site/css/site.css | 1 + Maven/my-app/target/site/dependencies.html | 236 +++ .../target/site/dependency-convergence.html | 130 ++ Maven/my-app/target/site/dependency-info.html | 137 ++ Maven/my-app/target/site/images/close.gif | Bin 0 -> 279 bytes Maven/my-app/target/site/images/collapsed.gif | Bin 0 -> 53 bytes Maven/my-app/target/site/images/expanded.gif | Bin 0 -> 52 bytes Maven/my-app/target/site/images/external.png | Bin 0 -> 230 bytes .../target/site/images/icon_error_sml.gif | Bin 0 -> 1010 bytes .../target/site/images/icon_info_sml.gif | Bin 0 -> 606 bytes .../target/site/images/icon_success_sml.gif | Bin 0 -> 990 bytes .../target/site/images/icon_warning_sml.gif | Bin 0 -> 576 bytes .../images/logos/build-by-maven-black.png | Bin 0 -> 2294 bytes .../images/logos/build-by-maven-white.png | Bin 0 -> 2260 bytes .../site/images/logos/maven-feather.png | Bin 0 -> 3330 bytes Maven/my-app/target/site/images/newwindow.png | Bin 0 -> 220 bytes Maven/my-app/target/site/index.html | 102 + .../my-app/target/site/plugin-management.html | 122 ++ Maven/my-app/target/site/plugins.html | 141 ++ Maven/my-app/target/site/project-info.html | 129 ++ Maven/my-app/target/site/project-summary.html | 140 ++ .../TEST-com.mycompany.app.AppTest.xml | 63 + .../com.mycompany.app.AppTest.txt | 4 + Maven/my-webapp/.classpath | 7 + Maven/my-webapp/.metadata/.lock | 0 .../org.eclipse.ant.ui/dialog_settings.xml | 3 + .../.root/.indexes/history.version | 1 + .../.root/.indexes/properties.index | Bin 0 -> 57 bytes .../.root/.indexes/properties.version | 1 + .../org.eclipse.core.resources/.root/2.tree | Bin 0 -> 81 bytes .../.safetable/org.eclipse.core.resources | Bin 0 -> 676 bytes .../.settings/org.eclipse.ant.ui.prefs | 3 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 14 + .../.settings/org.eclipse.jdt.launching.prefs | 2 + .../.settings/org.eclipse.jdt.ui.prefs | 13 + .../.settings/org.eclipse.pde.api.tools.prefs | 2 + .../.settings/org.eclipse.pde.core.prefs | 2 + .../.settings/org.eclipse.ui.browser.prefs | 2 + .../.settings/org.eclipse.ui.editors.prefs | 2 + .../.settings/org.eclipse.ui.ide.prefs | 5 + .../.settings/org.eclipse.ui.prefs | 2 + .../org.eclipse.e4.workbench/workbench.xmi | 1701 +++++++++++++++++ .../assumedExternalFilesCache | Bin 0 -> 4 bytes .../org.eclipse.jdt.core/externalFilesCache | Bin 0 -> 4 bytes .../org.eclipse.jdt.core/invalidArchivesCache | Bin 0 -> 4 bytes .../org.eclipse.jdt.core/nonChainingJarsCache | Bin 0 -> 4 bytes .../variablesAndContainers.dat | Bin 0 -> 399 bytes .../org.eclipse.jdt.launching/.install.xml | 4 + .../libraryInfos.xml | 22 + .../org.eclipse.jdt.ui/OpenTypeHistory.xml | 2 + .../QualifiedTypeNameHistory.xml | 2 + .../org.eclipse.jdt.ui/dialog_settings.xml | 11 + .../dialog_settings.xml | 17 + .../.cache/clean-cache.properties | 2 + .../.local_targets/1421858174878.target | 15 + .../dialog_settings.xml | 5 + .../dialog_settings.xml | 21 + .../org.eclipse.ui.workbench/workingsets.xml | 4 + Maven/my-webapp/.metadata/version.ini | 3 + Maven/my-webapp/.project | 14 + Maven/my-webapp/pom.xml | 35 + .../my-webapp/src/main/webapp/WEB-INF/web.xml | 7 + Maven/my-webapp/src/main/webapp/index.jsp | 5 + .../target/maven-archiver/pom.properties | 5 + .../target/my-webapp/WEB-INF/web.xml | 7 + Maven/my-webapp/target/my-webapp/index.jsp | 5 + Maven/pom.xml | 17 + .../{State.java => AudioPlayerCommand.java} | 0 82 files changed, 3579 insertions(+) create mode 100644 Maven/my-app/.classpath create mode 100644 Maven/my-app/.project create mode 100644 Maven/my-app/pom.xml create mode 100644 Maven/my-app/src/main/java/com/mycompany/app/App.java create mode 100644 Maven/my-app/src/test/java/com/mycompany/app/AppTest.java create mode 100644 Maven/my-app/target/maven-archiver/pom.properties create mode 100644 Maven/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 Maven/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 Maven/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst create mode 100644 Maven/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 Maven/my-app/target/site/css/maven-base.css create mode 100644 Maven/my-app/target/site/css/maven-theme.css create mode 100644 Maven/my-app/target/site/css/print.css create mode 100644 Maven/my-app/target/site/css/site.css create mode 100644 Maven/my-app/target/site/dependencies.html create mode 100644 Maven/my-app/target/site/dependency-convergence.html create mode 100644 Maven/my-app/target/site/dependency-info.html create mode 100644 Maven/my-app/target/site/images/close.gif create mode 100644 Maven/my-app/target/site/images/collapsed.gif create mode 100644 Maven/my-app/target/site/images/expanded.gif create mode 100644 Maven/my-app/target/site/images/external.png create mode 100644 Maven/my-app/target/site/images/icon_error_sml.gif create mode 100644 Maven/my-app/target/site/images/icon_info_sml.gif create mode 100644 Maven/my-app/target/site/images/icon_success_sml.gif create mode 100644 Maven/my-app/target/site/images/icon_warning_sml.gif create mode 100644 Maven/my-app/target/site/images/logos/build-by-maven-black.png create mode 100644 Maven/my-app/target/site/images/logos/build-by-maven-white.png create mode 100644 Maven/my-app/target/site/images/logos/maven-feather.png create mode 100644 Maven/my-app/target/site/images/newwindow.png create mode 100644 Maven/my-app/target/site/index.html create mode 100644 Maven/my-app/target/site/plugin-management.html create mode 100644 Maven/my-app/target/site/plugins.html create mode 100644 Maven/my-app/target/site/project-info.html create mode 100644 Maven/my-app/target/site/project-summary.html create mode 100644 Maven/my-app/target/surefire-reports/TEST-com.mycompany.app.AppTest.xml create mode 100644 Maven/my-app/target/surefire-reports/com.mycompany.app.AppTest.txt create mode 100644 Maven/my-webapp/.classpath create mode 100644 Maven/my-webapp/.metadata/.lock create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.ant.ui/dialog_settings.xml create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ant.ui.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.api.tools.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.core.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.api.tools.ui/dialog_settings.xml create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.core/.local_targets/1421858174878.target create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml create mode 100644 Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml create mode 100644 Maven/my-webapp/.metadata/version.ini create mode 100644 Maven/my-webapp/.project create mode 100644 Maven/my-webapp/pom.xml create mode 100644 Maven/my-webapp/src/main/webapp/WEB-INF/web.xml create mode 100644 Maven/my-webapp/src/main/webapp/index.jsp create mode 100644 Maven/my-webapp/target/maven-archiver/pom.properties create mode 100644 Maven/my-webapp/target/my-webapp/WEB-INF/web.xml create mode 100644 Maven/my-webapp/target/my-webapp/index.jsp create mode 100644 Maven/pom.xml rename Topic1_Audio_Player/src/{State.java => AudioPlayerCommand.java} (100%) diff --git a/Maven/my-app/.classpath b/Maven/my-app/.classpath new file mode 100644 index 00000000..f99d68d0 --- /dev/null +++ b/Maven/my-app/.classpath @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Maven/my-app/.project b/Maven/my-app/.project new file mode 100644 index 00000000..9ff45808 --- /dev/null +++ b/Maven/my-app/.project @@ -0,0 +1,14 @@ + + + my-app + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file diff --git a/Maven/my-app/pom.xml b/Maven/my-app/pom.xml new file mode 100644 index 00000000..443c5e19 --- /dev/null +++ b/Maven/my-app/pom.xml @@ -0,0 +1,24 @@ + + + com.mycompany.app + app + 1.0-SNAPSHOT + + 4.0.0 + com.mycompany.app + my-app + jar + 1.0-SNAPSHOT + my-app + http://maven.apache.org + + + junit + junit + 3.8.1 + test + + + + diff --git a/Maven/my-app/src/main/java/com/mycompany/app/App.java b/Maven/my-app/src/main/java/com/mycompany/app/App.java new file mode 100644 index 00000000..79dccf4e --- /dev/null +++ b/Maven/my-app/src/main/java/com/mycompany/app/App.java @@ -0,0 +1,13 @@ +package com.mycompany.app; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello " + args[0]); + } +} diff --git a/Maven/my-app/src/test/java/com/mycompany/app/AppTest.java b/Maven/my-app/src/test/java/com/mycompany/app/AppTest.java new file mode 100644 index 00000000..33559900 --- /dev/null +++ b/Maven/my-app/src/test/java/com/mycompany/app/AppTest.java @@ -0,0 +1,38 @@ +package com.mycompany.app; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/Maven/my-app/target/maven-archiver/pom.properties b/Maven/my-app/target/maven-archiver/pom.properties new file mode 100644 index 00000000..4c5262e7 --- /dev/null +++ b/Maven/my-app/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Mon Jan 19 23:44:14 GMT 2015 +version=1.0-SNAPSHOT +groupId=com.mycompany.app +artifactId=my-app diff --git a/Maven/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/Maven/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 00000000..de9dba09 --- /dev/null +++ b/Maven/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +com/mycompany/app/App.class diff --git a/Maven/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/Maven/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 00000000..79ecf49a --- /dev/null +++ b/Maven/my-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/home/meli/my-app/src/main/java/com/mycompany/app/App.java diff --git a/Maven/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/Maven/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 00000000..63481846 --- /dev/null +++ b/Maven/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +com/mycompany/app/AppTest.class diff --git a/Maven/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/Maven/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 00000000..34df00f8 --- /dev/null +++ b/Maven/my-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/home/meli/my-app/src/test/java/com/mycompany/app/AppTest.java diff --git a/Maven/my-app/target/site/css/maven-base.css b/Maven/my-app/target/site/css/maven-base.css new file mode 100644 index 00000000..53153e9f --- /dev/null +++ b/Maven/my-app/target/site/css/maven-base.css @@ -0,0 +1,155 @@ +body { + margin: 0px; + padding: 0px; +} +img { + border:none; +} +table { + padding:0px; + width: 100%; + margin-left: -2px; + margin-right: -2px; +} +acronym { + cursor: help; + border-bottom: 1px dotted #feb; +} +table.bodyTable th, table.bodyTable td { + padding: 2px 4px 2px 4px; + vertical-align: top; +} +div.clear{ + clear:both; + visibility: hidden; +} +div.clear hr{ + display: none; +} +#bannerLeft, #bannerRight { + font-size: xx-large; + font-weight: bold; +} +#bannerLeft img, #bannerRight img { + margin: 0px; +} +.xleft, #bannerLeft img { + float:left; +} +.xright, #bannerRight { + float:right; +} +#banner { + padding: 0px; +} +#banner img { + border: none; +} +#breadcrumbs { + padding: 3px 10px 3px 10px; +} +#leftColumn { + width: 170px; + float:left; + overflow: auto; +} +#bodyColumn { + margin-right: 1.5em; + margin-left: 197px; +} +#legend { + padding: 8px 0 8px 0; +} +#navcolumn { + padding: 8px 4px 0 8px; +} +#navcolumn h5 { + margin: 0; + padding: 0; + font-size: small; +} +#navcolumn ul { + margin: 0; + padding: 0; + font-size: small; +} +#navcolumn li { + list-style-type: none; + background-image: none; + background-repeat: no-repeat; + background-position: 0 0.4em; + padding-left: 16px; + list-style-position: outside; + line-height: 1.2em; + font-size: smaller; +} +#navcolumn li.expanded { + background-image: url(../images/expanded.gif); +} +#navcolumn li.collapsed { + background-image: url(../images/collapsed.gif); +} +#navcolumn li.none { + text-indent: -1em; + margin-left: 1em; +} +#poweredBy { + text-align: center; +} +#navcolumn img { + margin-top: 10px; + margin-bottom: 3px; +} +#poweredBy img { + display:block; + margin: 20px 0 20px 17px; +} +#search img { + margin: 0px; + display: block; +} +#search #q, #search #btnG { + border: 1px solid #999; + margin-bottom:10px; +} +#search form { + margin: 0px; +} +#lastPublished { + font-size: x-small; +} +.navSection { + margin-bottom: 2px; + padding: 8px; +} +.navSectionHead { + font-weight: bold; + font-size: x-small; +} +.section { + padding: 4px; +} +#footer { + padding: 3px 10px 3px 10px; + font-size: x-small; +} +#breadcrumbs { + font-size: x-small; + margin: 0pt; +} +.source { + padding: 12px; + margin: 1em 7px 1em 7px; +} +.source pre { + margin: 0px; + padding: 0px; +} +#navcolumn img.imageLink, .imageLink { + padding-left: 0px; + padding-bottom: 0px; + padding-top: 0px; + padding-right: 2px; + border: 0px; + margin: 0px; +} diff --git a/Maven/my-app/target/site/css/maven-theme.css b/Maven/my-app/target/site/css/maven-theme.css new file mode 100644 index 00000000..c982168b --- /dev/null +++ b/Maven/my-app/target/site/css/maven-theme.css @@ -0,0 +1,141 @@ +body { + padding: 0px 0px 10px 0px; +} +body, td, select, input, li{ + font-family: Verdana, Helvetica, Arial, sans-serif; + font-size: 13px; +} +code{ + font-family: Courier, monospace; + font-size: 13px; +} +a { + text-decoration: none; +} +a:link { + color:#36a; +} +a:visited { + color:#47a; +} +a:active, a:hover { + color:#69c; +} +#legend li.externalLink { + background: url(../images/external.png) left top no-repeat; + padding-left: 18px; +} +a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover { + background: url(../images/external.png) right center no-repeat; + padding-right: 18px; +} +#legend li.newWindow { + background: url(../images/newwindow.png) left top no-repeat; + padding-left: 18px; +} +a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover { + background: url(../images/newwindow.png) right center no-repeat; + padding-right: 18px; +} +h2 { + padding: 4px 4px 4px 6px; + border: 1px solid #999; + color: #900; + background-color: #ddd; + font-weight:900; + font-size: x-large; +} +h3 { + padding: 4px 4px 4px 6px; + border: 1px solid #aaa; + color: #900; + background-color: #eee; + font-weight: normal; + font-size: large; +} +h4 { + padding: 4px 4px 4px 6px; + border: 1px solid #bbb; + color: #900; + background-color: #fff; + font-weight: normal; + font-size: large; +} +h5 { + padding: 4px 4px 4px 6px; + color: #900; + font-size: normal; +} +p { + line-height: 1.3em; + font-size: small; +} +#breadcrumbs { + border-top: 1px solid #aaa; + border-bottom: 1px solid #aaa; + background-color: #ccc; +} +#leftColumn { + margin: 10px 0 0 5px; + border: 1px solid #999; + background-color: #eee; +} +#navcolumn h5 { + font-size: smaller; + border-bottom: 1px solid #aaaaaa; + padding-top: 2px; + color: #000; +} + +table.bodyTable th { + color: white; + background-color: #bbb; + text-align: left; + font-weight: bold; +} + +table.bodyTable th, table.bodyTable td { + font-size: 1em; +} + +table.bodyTable tr.a { + background-color: #ddd; +} + +table.bodyTable tr.b { + background-color: #eee; +} + +.source { + border: 1px solid #999; +} +dl { + padding: 4px 4px 4px 6px; + border: 1px solid #aaa; + background-color: #ffc; +} +dt { + color: #900; +} +#organizationLogo img, #projectLogo img, #projectLogo span{ + margin: 8px; +} +#banner { + border-bottom: 1px solid #fff; +} +.errormark, .warningmark, .donemark, .infomark { + background: url(../images/icon_error_sml.gif) no-repeat; +} + +.warningmark { + background-image: url(../images/icon_warning_sml.gif); +} + +.donemark { + background-image: url(../images/icon_success_sml.gif); +} + +.infomark { + background-image: url(../images/icon_info_sml.gif); +} + diff --git a/Maven/my-app/target/site/css/print.css b/Maven/my-app/target/site/css/print.css new file mode 100644 index 00000000..f09d546c --- /dev/null +++ b/Maven/my-app/target/site/css/print.css @@ -0,0 +1,7 @@ +#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn { + display: none !important; +} +#bodyColumn, body.docs div.docs { + margin: 0 !important; + border: none !important +} diff --git a/Maven/my-app/target/site/css/site.css b/Maven/my-app/target/site/css/site.css new file mode 100644 index 00000000..055e7e28 --- /dev/null +++ b/Maven/my-app/target/site/css/site.css @@ -0,0 +1 @@ +/* You can override this file with your own styles */ \ No newline at end of file diff --git a/Maven/my-app/target/site/dependencies.html b/Maven/my-app/target/site/dependencies.html new file mode 100644 index 00000000..86029e48 --- /dev/null +++ b/Maven/my-app/target/site/dependencies.html @@ -0,0 +1,236 @@ + + + + + + my-app - Project Dependencies + + + + + + + + + +
+ +
+
+
+ +
+

Project Dependencies

+
+

test

+

The following is a list of test dependencies for this project. These dependencies are only required to compile and run unit tests for the application:

+ + + + + + + + + + + + +
GroupIdArtifactIdVersionTypeLicense
junitjunit3.8.1jarCommon Public License Version 1.0
+
+

Project Transitive Dependencies

+

No transitive dependencies are required for this project.

+
+

Project Dependency Graph

+ +
+

Dependency Tree

+
    +
  • com.mycompany.app:my-app:jar:1.0-SNAPSHOT Information +
      +
    • junit:junit:jar:3.8.1 (test) Information
+
+

Licenses

+

Unknown: my-app

+

Common Public License Version 1.0: JUnit

+
+

Dependency File Details

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FilenameSizeEntriesClassesPackagesJava VersionDebug Information
junit-3.8.1.jar121.07 kB11910061.1Yes
TotalSizeEntriesClassesPackagesJava VersionDebug Information
1121.07 kB11910061.11
test: 1test: 121.07 kBtest: 119test: 100test: 6-test: 1
+
+

Dependency Repository Locations

+ + + + + + + + + + +
Repo IDURLReleaseSnapshot
centralhttps://repo.maven.apache.org/maven2YesNo
+

Repository locations for each of the Dependencies.

+ + + + + + + + + + + + +
Artifactcentral
junit:junit:jar:3.8.1Found at https://repo.maven.apache.org/maven2
Totalcentral
1 (test: 1)1
+
+
+
+
+
+ + + diff --git a/Maven/my-app/target/site/dependency-convergence.html b/Maven/my-app/target/site/dependency-convergence.html new file mode 100644 index 00000000..9dcd0e24 --- /dev/null +++ b/Maven/my-app/target/site/dependency-convergence.html @@ -0,0 +1,130 @@ + + + + + + my-app - Dependency Convergence + + + + + + + + + +
+ +
+
+
+
+

Dependency Convergence

+ + + +
+ Legend: +
errorAt least one dependency has a differing version of the dependency or has SNAPSHOT dependencies.

+ + + + + + + + + + + + + + + + + + +
+ Statistics: +
Number of dependencies (NOD):1
Number of unique artifacts (NOA):1
Number of version-conflicting artifacts (NOC):0
Number of SNAPSHOT artifacts (NOS):0
Convergence (NOD/NOA):success 100 %
Ready for release (100 % convergence and no SNAPSHOTS):success Success
+
+

Dependencies used in this project

+
+
+
+
+
+ + + diff --git a/Maven/my-app/target/site/dependency-info.html b/Maven/my-app/target/site/dependency-info.html new file mode 100644 index 00000000..1249f72e --- /dev/null +++ b/Maven/my-app/target/site/dependency-info.html @@ -0,0 +1,137 @@ + + + + + + my-app - Dependency Information + + + + + + + + + +
+ +
+
+
+
+

Dependency Information

+
+

Apache Maven

+
+
<dependency>
+  <groupId>com.mycompany.app</groupId>
+  <artifactId>my-app</artifactId>
+  <version>1.0-SNAPSHOT</version>
+</dependency>
+
+

Apache Buildr

+
+
'com.mycompany.app:my-app:jar:1.0-SNAPSHOT'
+
+

Apache Ivy

+
+
<dependency org="com.mycompany.app" name="my-app" rev="1.0-SNAPSHOT">
+  <artifact name="my-app" type="jar" />
+</dependency>
+
+

Groovy Grape

+
+
@Grapes(
+@Grab(group='com.mycompany.app', module='my-app', version='1.0-SNAPSHOT')
+)
+
+

Grails

+
+
compile 'com.mycompany.app:my-app:1.0-SNAPSHOT'
+
+

Leiningen

+
+
[com.mycompany.app/my-app "1.0-SNAPSHOT"]
+
+

SBT

+
+
libraryDependencies += "com.mycompany.app" % "my-app" % "1.0-SNAPSHOT"
+
+
+
+
+
+ + + diff --git a/Maven/my-app/target/site/images/close.gif b/Maven/my-app/target/site/images/close.gif new file mode 100644 index 0000000000000000000000000000000000000000..1c26bbc5264fcc943ad7b5a0f1a84daece211f34 GIT binary patch literal 279 zcmZ?wbhEHb6kyFkwP}e}6+mLp=yE)H5&?6cps==O-j2#K*@61O)i|`#U%|*xTD17#Qg5 z>nkWI$ji$M2ng`=^D}^ygDj#2&;c6F0P+h1n~g(5frm~PL&uV$l`S$eFDwzBDbhJD v>}Bvw*Al_tWna1PC9OaGVdk23i}vRhZI{iR^*V|n<^22a#~T_O9T}_vbswrX literal 0 HcmV?d00001 diff --git a/Maven/my-app/target/site/images/collapsed.gif b/Maven/my-app/target/site/images/collapsed.gif new file mode 100644 index 0000000000000000000000000000000000000000..6e710840640c1bfd9dd76ce7fef56f1004092508 GIT binary patch literal 53 ycmZ?wbhEHbWM^P!XkdT>#h)yUTnvm1Iv_qshJlI4r7uBZ*YkPFU8d4p4Aua}2?(?R literal 0 HcmV?d00001 diff --git a/Maven/my-app/target/site/images/expanded.gif b/Maven/my-app/target/site/images/expanded.gif new file mode 100644 index 0000000000000000000000000000000000000000..0fef3d89e0df1f8bc49a0cd827f2607c7d7fd2f0 GIT binary patch literal 52 xcmZ?wbhEHbWM^P!XkdT>#h)yUTnvm1Iv_qshJlH@g}+fUi&t{amUB!D)&R0C2fzRT literal 0 HcmV?d00001 diff --git a/Maven/my-app/target/site/images/external.png b/Maven/my-app/target/site/images/external.png new file mode 100644 index 0000000000000000000000000000000000000000..3f999fc88b360074e41f38c3b4bc06ccb3bb7cf8 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^+(699!3-oX?^2ToQY`6?zK#qG>ra@ocD)4hB}-f* zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%@dWsUxR#cd{{R1fCIbVIy!atN z8e~{WkY6y6%iy53@(Yk3;OXKRQgJIOfsI*BO@UFsfhWLBc>*(#PB?Jn2*(o!76E4F z2oaVU3``tH+Kgs0GI5+@Tg}d)z%jd%F@?{8!SRZ5b1yT80-FZIMn)zc2Ca66y`pzY R*nwsJMCn#OVEqF*oew~oaAu*+mN;-=y?VHT3tIe$XQqrDo-uB_a z!$aaK`z6))OKGn34?nwc^SuifkIL#EmDgV_qjg-#8v*0u4q4%1moUw{LZ54UeCgzNF^jX`uv-XK+9g@yFrG9?@ z!9&5&Tgk*j(b!GF&{N4I-Owl3GNQ;Kslp@APSw&&&ux9d>WxL~{EYoKm2KHvv3+ax zZUYB?Ae*8JnchZheXeEaa>@87?_fB*jV>(`erUx0B6j@wa!KnN)QWMO1rn9HC8 zQU}Tt3>@bftT|;oHYhlHH8T8tc{qL2LBC1&wnQeg^-S05<#H=J%;q~&KX!$OXH$lP zifQJ#9>L8|xhAVRHT-xPa*}7JK>(A*!AmL!CQC~j>707p+C5b#ib-SZ5@wfn#-0y8 zor_pb3M^%mkXhlduwjw4dk@RWhYZ<*tSUAV9x3eYyi#^d39lH{872xT#>g14FgCZb z+Lvv}DClhGVU*`8y(Qe}(9I>Lw<6->0~Q`zX3oMH2272dBARI`0wDzxS_G8b_H+a` TZ#n2*^y*Bf^Krq04Gh)*dSnrT literal 0 HcmV?d00001 diff --git a/Maven/my-app/target/site/images/icon_info_sml.gif b/Maven/my-app/target/site/images/icon_info_sml.gif new file mode 100644 index 0000000000000000000000000000000000000000..c6cb9ad7ce438a798426703e86a7ffc197d51dbb GIT binary patch literal 606 zcmZ?wbhEHb!Rj)7jHhhdgsOUdoQoueZi?7 z>>gViTe&E#V48n=mrru5S3;v}WQB8hiDz7$TU2Fg8RZkU)J)l4H+4sO@7jjxJ4?G(<~7c1nYFul=C0P+d#d`@bj{yi z-npcE!T#Qb2PP~z)H;3B%r(bntUlH>Y2~CvyV|C%UbyM>vTf&9?!2&e&!siHFV0_c zVB`KP8}?n^dg$7Yqc`@PxOMQ%-NWbZ9Xfk=)1K2OFF!hV;r{6>kIr6ua^~ve%eS9j zy7lbD`I|4_et!J??bq+WzI^-n`RfmdkOIfh!pgqYwSCK`t~@$#!^!1aj_y2mzyI{@?vuB79>2N$==JkApPs$`_~ygc*YCf)diVLp z{pXKfy#M&+`?nvze*gIk#Q*;N0|qHLXbBUFKUo+V7>XElKuSSz!oa?}p{S|3rL`#` zEj=M8CWV#D$GthOu#hRgfH^NPHz`Z6or!6tudIJkhF|)EqL_SUmH;#E=*;vU)ut4d z*}1MJ+3|6yK5|W*0YQlwY}}E_93D;*P3)($(!#iHyj&dYc$?gAB*f@)n?~7Mn)5Ze zB*b!gs&gB@F*e|Da`5(ac688Lp~TGAEh5PBlHo`4aV}w%hy?;49h(#+>`NXTD0Bjy;4ci{C-1K14rU#4Xoa9{m6qopA9n0cn|!>ecYkij zwyX=!4*mH3EoqLqSGiVbyFqxD(bS8XSDu{6U1jZO70Ic@{~t&7=B^ zBD)NOoAkU&Gy^LQJ5PtV?u{&65}4ZUmfYbweP{LTy^YnAGv=AGa7*6wj}%~b0?7r5!@qH7P%p1*$L z@#{ODxoUwG+WsY)zWExj-aqxpQS(e!bx&6L`u)?tfB$~}{{8*?cVO&*V`-G2NeC$Z zWMO1r=w{FXnGVVm3>>=|#5rX=HY{-DP?VFNPL-%m%>B+*~5-k^-+4*MLFr;tQ0}^rlS-^!^Q`Mx1hrB$jwn&hk~Xk=#Nl+_9Nu|Y$D G!5RQ;-6)O# literal 0 HcmV?d00001 diff --git a/Maven/my-app/target/site/images/icon_warning_sml.gif b/Maven/my-app/target/site/images/icon_warning_sml.gif new file mode 100644 index 0000000000000000000000000000000000000000..873bbb52cb9768103c27fbb9a9bac16ac615fce5 GIT binary patch literal 576 zcmZ?wbhEHbB!Sy%bj7w z8LP{2I!WYbmF&-Ixi?j6tD|K1XR2M#l>Aw*aXL%wXS3nYW}{zi=4WzsU5r%E6qx+# za{AThd85YVOsT`KDUrWsBtGknIa3>Sy(4;AS@f^Dxt>-=XPXm#FD(1Lr2hBv=9?3X zZS^!XrNw@)>eiN((2|w-y>{aB1+99DGMA?}+UTggT+(Z*rf8+5x~aWVOGcurtl;&U zIa)H3I&#vwvQjJBn`YHj9iKlB7`)(M#!e{yWMO1rC}Yq8NrU2qfqia6SyOXMYa1sM zM_a34eqyRfcQbQJY;^IYGTuzaxglKLqNQEA}OiQec+sQ#rUUjLqg_MpsPmY43 zsgmVV8EHK$eV-B~6*UcAW2+w%1e4o&9#aAczLGF}PmMg|6J0Ey4q A)Bpeg literal 0 HcmV?d00001 diff --git a/Maven/my-app/target/site/images/logos/build-by-maven-black.png b/Maven/my-app/target/site/images/logos/build-by-maven-black.png new file mode 100644 index 0000000000000000000000000000000000000000..919fd0f66a7f713920dd7422035db1c9d484351d GIT binary patch literal 2294 zcmVKOG`!VuDc=fnx$+R6#>c^>b&wcOS?|$!`a}U6ptjU_J zlBA}l*3{J0)YMd0R~Hr*dU$xO^ie1jhYlTLS+=C4#MRYRCX#twGUSD6Il$6AA+=UAlkY(ZF;m4037Yc>v&!1mPsNXdliHV74&z>zUEv=}iC@U)i zfc^XTJ3BiAKvYyzczAd~K){|od(ip)`}f`5-HnZnv$L~Hzqq=(y7Kb!>gsAwPfu@e z@3gcu0LabFC4?{xBNPh18Fpy3+Tr2hfq{Yc_V$w}PjVdhGtMTH$zU){PfznaPmK)? z4KH52=;-KZX=#a#jlFZ{PF7YH!!Q{c8Taqs=Xt)UsK{tE{@>vc{2Hgh!NL0adH}e0 z@19Df^78Tm0ES@zz{SO7Zf@=upJ1_AP_bIAgpih&mWqmsojZ4GG#a&9{f)&Au~_Wm z<0F^L4;(mPHk)-io!M*-3JMa7#VIK%EBy%}_$g6IPEM9cBvPp~K0f}{t5+6_rMbEJ z(xpqcZ{G$0j^p<2+vnuu^bN3MdU`rLJ3Br;9ss7MrVbuFxUjHLQBhGX6WriQ5|M*_w z@5bUDdV71dTCG;AO-@dx@4a~OA{y)K>k+2N$jAo|9?w z?b_+nr`2k;!{M;o?Qh<^`R=>#RtFA0KR<`Vfh)Li;|5+X!otGn&U<@%H*VaBDU;Gf zr_<5=()7Iqfmk>yLj`}084`48Zf?d|M~)mpOHfeI{QNv2WMN?;Dk=&9GBY#LVzb%$ z`};Aq6GAK&OK4~)&U*g*IT{xh7M8K~%9SgtQ-;OG#ZeC5ym=F=X|vf(9h#b&K7RZN z05+S=X0xGjU|@g-%ePwl!GC`7t=5VDruDp`t9rXwq=tAb*88KQqo~N`a#V_oixKzA z%F4dJzL1cRy1F{CSUfW`qfjWeZ{Hpm7>H$yNF>V6&c<>vGBOgU_w@7}J9g~o(WA6z z#sgc0B0VlH4i&T6{Pyiz)FUDys6$s*7rnXCi!3z)!0DGJ5eITHyM2Q|E@qtti{QRD z*nbiZg+h^&lY>QINl6I+oH}*N-Q67kYHMqqoSd*@fE67^695Pa36aTU0HD+95)%{g zFw)c0Gcqy&K&4WxG906$qk6p_b=txpgmiazqaGF(M)NU+!{3cPsc^{*a`Ja$nXfZ@ zhsL%N4whw0OG`2M6&4oG&CQ8KBHBPHC@3f>C|I^a>__(qFp!^RU zV`F0uhl6EVxm><`_ijATmoHz|)ztxjL?XdmSuB<(Po5A$mM!w}C3kdS~ef}W>dub-Hhz&fI`vJ#oXvTST@?6qsxN=r)tz|+%n^XARiL+I)0 z!HGL|?4Z?OC@z>ppO+fmk zEDIk1FgrV2R8&O&@;qNwR)+h@$;nZx)dqvXVzG2}b>-#d_4oHa!G&Dp59OYMg zd;9A2I}{29&+|ObzkB!Y^XJcKjE;^*({SomlT)I^E^_90Q{xPG;bvU;38ml zcng&pTZhKxAmAX-{xuvUBO`bZu-omWrKK8;X6fkl>(@`5I6;GyySuwkDCBv*tE;QE zwH1kg)0Ijk1~{Qms8A@Vadob6a=9D}VUx-9>C-1l1S|^dcDq`w#&Z*k#hB*+K%>#n z=0$)zo8T)X1Ujc}V+Omw8!O@%0GKp7%(fp1ER{;7QYogYiHQlT)w*&q5{X2iP;Ak literal 0 HcmV?d00001 diff --git a/Maven/my-app/target/site/images/logos/build-by-maven-white.png b/Maven/my-app/target/site/images/logos/build-by-maven-white.png new file mode 100644 index 0000000000000000000000000000000000000000..7d44c9c2e5742bdf8649ad282f83208f1da9b982 GIT binary patch literal 2260 zcmV;_2rKuAP)4hTLUyOQ{PVbVY5&Y3g!&hN~bnR7}ZgkXUt ziC%zU0gf+&kEv>t|d$x|zXw1mS0D%1b{8z7DF%0wW-8(XBFc`A3vVI|O z^!N97baWg(eE86zLn4uA_wL=Zb@+UKU|=8sJb3V6XlSUctSl!dhm4xd=KJ^W|8h2q zR4NS%3yX+|NKQ`f?d=7Cf`Wo)&z=E5TU%REQIXYZefjbwRvsQ6zIyfQojZ3l8V#{v zv)R(q)39Vr2GBPsa+apV2%%fIZY3ln0Kl+1Y8c*(xe3X6sWFH9kH*UDDLl)ZN`}u~;f9D%P!A2LK5P2`MQl z(b3TuDUC++_U+qm01k;n!Z1u+TwGjS+}X2d^Yil+3Pn;B-~q z{Qdm_z{kf&EEb1^gw)j3R904!x}#RBj~+c578Vv16olc}xpQZGd;7k9`>@WHD_2M| z{%VB2fNVCK&1U^_rTW_bx`C@MK&%ZR^ybZ*=;&yb zN);0mV>X+~OA`|lRVtNAr7A8i#zL)DyJycHxm+$5izO0?QmM?$%p@6le0*H3R;yI1 z=;-LCrlu1oPI!8HIypHhmCA~Wig|;>WHON!GbSbmcN`jxhJ=GssnlpRR;zVzaF8J4 z>+3sJhW@0w{LH6-`(Afr<9kMWBXoSUM7Dox&JGJtojOI96z3EG z*uH)HWN?qO7x!`hzQnzLg5JL3Ui^ps%X$n4`+YK2S-yNZo>gC8kJmXUC#D?-i_a7IlwdR(Kkw#T>s)<( zJ!ZVTycREBO!{t;H9|r{F#q)FQ_`LjAsBnPnnKk2PZ;V3*7{M#@%jyBNObh|^_fg2 zd|f0I3eTTEPf=83VhUbHWgRft|{%MRRMp6H>seM7wV6&k5Vn7H0DDSDT_wn(;aaUDU zWi%QoiptK;CgqIWB$bwy78Mm?w@oI~&6_tPBO~$kExCLno}10)mX;RGM?^%-PjqOt zTFi(#=@4C7NJmxEVK7l6G0yhEp_Lq9)1fj}S-2%Mdrv$L~tStVt%xVSheDG9e5EX$6J zj8GIMm&=bIKaK;TqoYG05D0}r0!Kqb1E0?q2n1`_uAR{_f0E{OgnR$~y~Sd|+0n_# z2@6L?MsUQ^H0|QzLJoDKqobtlneyk|8`Sp{cp}PUC5RRQ^8?;2;Iss$eWk%*n3$Nr z(73v~e)3}s219#$yTM=(2n6o#?!LahxUO>?H!v`O%bZ*;$Ideh!!Qg0h{fVXix$lf i91DLtEx@rr0RIK2cl{g~?Z1Nn0000}s literal 0 HcmV?d00001 diff --git a/Maven/my-app/target/site/images/logos/maven-feather.png b/Maven/my-app/target/site/images/logos/maven-feather.png new file mode 100644 index 0000000000000000000000000000000000000000..b5ada836e9eb4af4db810f648b013933e72c8fbe GIT binary patch literal 3330 zcmX9>c{JN;_x~o5Ac>t)`_^PEV{L6MNl>(?QcG&7ly=N-Xep}HlEki6%d`xGQff?J zZ3V5?nxMK^TW!%rlc2Oi#TE&YeBaFbd(OGfJqdI` zc>}=J0{}qD0)QP*?7suRWeWiKhXeo)6#$?b`+NA18vvk_kGT^3lRrj~)ZiX~E=7&X z2SKm_0zsnO+$cbVdd$U-?NJjv4pVQ1Nhjly1q-WLl67`_;z%v-QHPc;g_!S~IRE^{ z!-r;4Azogl1_mw!0>pbvoPqVZ9U2s5dwy6sHa1p4L7^@xJ3CvqEtc6=V;Sjo`SKw` zH=oaUc5x93g$)f2RLqLwrQCI9Ez?$q{#(_7txem8O7-r(E=u3NrnVzb>g3;N!E`D4 z$F(MEarBhUUxI^!j~_>3u~Bhx7JsSR*w|dSa6vbc*_R&srRM|ftV?XHdFb}1C$WrQ zvCqw{t=r+KeZT{28=Et|SGiR|Ew_)PCPc7HL$FRx^tIjT!gS^&HZAG+)pJ^j_L!yB z-&JbQI5tJZ0TS}9l}GV-#=yY9@UZdW!+Wo8V)3OP+M~kh8Cox&UgiEXkb|OHrtnt7 z^5^7qoPgd(mzSp^UljFw^Ea1#($jleS~zn<*Qt%~?;g8p7T$+e1_e6_0RivD9i_fn zntBj|S0D{TF>ZC0BjrC=O}^<#pa0LS&uvarfWzp2`pUd__f_%7YV~7dt=r6SgMYpk zjT&tozdBVDfMU+}3PBKu{I@a0eE%y;<26%LfpraXnsz78oRL+ASlucsJ9Ov}^-cnR z?X0S*D(PH#SsA1;IVGjHr-u@pc=<9LQ|*-QU~8*d0k5yGUszbEsHmW5uYUjj;c@h| zc=i>Ql~f4Q{2jFogTeH_k#4q)N#10=x?L3lT5fn+n;f?)a5}#)D(b9?5F`jW*8R2B zY10|kzu50Yt-pEkr?pP=J)v#j+39IETXnv??EKOqdr`^I$PR$!&#+i*wr^07q=V|W zRr`cRLkwol7wvCgY>XVWV#HBVP$e>vs8#}bhe8j(d*@G*O1g5TCFF^jnVIZQvS`z% z5v0FEpQe3XqLbN{Z+4@!!}?n1jYn$VqUAWElr$a=d)NRcr?dxiBP0c$a4eq)C6kW} zg`-#3YZthl;XEcu_;g!xn!}4v15@n5*WxOpB14=8A8Dk>`K z>FLRD7bsziv>lNxci1YB3`T!HV#jF&kvayv7^9-Sg&l|eQ^qB(FU%g~JDx-!K6@(Waovi+Tc$s`@s@Sv* z9p0C*!~5#c{h1>d>@N5DL);Ea=d|PU4}@o zGdG0Ng%R<9V_jn-yfB3nD7kxXb8!sMIXlJ1WeD*5?60hT&XSa)+yVTVl9iP_o8v^w8_0650v?-3$V0uILqsvdAu+2y6|YCewgNhga^h4Y-lNq0Cah}ivo zpoq6EpmWSceZAoF%B5UfVPU3op{AfPhFM{FSFJMU!)c~SDTMch@trf6$~-E;5xn-d z<8`e~UPj0w%vDYVje(iQii)`c=wzHbR6^djAF^dnW5A}!CD-JMWyVHEkW;BwukLPq z9nsR%B=!TuB0vQ|DPO#J@zkle(n^?>&z)~)XSMt|Ks2+uT9af6QEqK-hanLX5&&xP z-l-<%m`WTuBR<~hh#iYkQxoQNXtTFvX)i0JF_1Iu5Wn+7^XJlfPFX+T%IM9_7+4B=%5Y=a!X6S`QV)~knSitusE`|vEgD?+D*SdgtN-v z@2!tnPsQ$W9OoldXg5!7EGfyuKEmbk%8!pz518D&%P>a8*ji>n+N5Y15QI!N3aw76 zk?~TlC_r^z21V(@jrIB2O=fW{*e;OxLwTOl%b7{65NYoUzv46uU?y1WK`h1$gXk#s zGM!NC1T6)2&vea(*Gjoe-Y0OseT68UKVi7GtWs>+{mTm3?9wmCl9JqVL7fcIg7PHy zS|uV8fd^!W2I;)j*_@ml#-BrjgIWH)bTI&Jf1fXAax!YjYcdmoW44Np%MhjRZR?D*fO!{1UqRj~p#EAohT=T-17$$k6AmQb( zr9h0V!aUsY=NL_BPmf|~=n=+2*+gqRK=3w1+z;yxltfUx%}G^AqM7qBoD>Zu#))>h z(O-H}7=Go_Xv&X~RNksk#{u}JDqbNyJIauD&lJ!>cpV`%&T(-`&1Vx}= z8{BIG$r-+Li5}_#{j}s%FlGk$jM1|WKp=Pv|*T=m!~I+rUjJ3F@7W!gumQD8RFwVZryr0 zG6IWssk0)%eJuVTRDtKPo&xDaOWF|RzCnozye=JYW-)oDFHKrbK}AL7sWkcH57B~D zWIZ`=QNK#g)SEJB!`69JGO3P=r08pDX))Bb6t@_;R!2TlYhv>Ek*cIBeDucB zNbDTV5C(L01Ze7}3Kc7OC~(zLdAV~G`9N+1xB3ie(wD=k6U z@g3gU065J9XPq{lyp>keB&(ixxdnV8$%i$asL6b0O)JUdYtCpuubGB*DbEFHXlQtp zXgMTG%@{+j0dI{Adnj6-$)BcQylA>}r~l(e_1pE-*`Eac5PAGF#EWMIO6;2ECZAeo ziPF85kd7Ft6f{I>ZQIUbf5YND4#d%gJpKl~IaM@Xl!bUvZj*0lQRvUOOhugnVG zMF7OiLdS5a+otCLNQI8V^8vu3ka8NP_S>32`v3S)2n{Pe(fRVLdLST=H+AiBqCTY3 zZWI=>Zsgp=`Z%jG=8)QMYZO=@1A#!)z2kiwpnq3DhkpUGZV&>CeaB0vA>Y6+Mrd+| zrA52d@P7Qe=6m=0Lz-`5yrGM(x*9Y0sP7_5T2*v`@~JgS7L3#>yY-7x_MJ+9`9JqyEa*$Q0 ziiL%hken<6A7+&3D;!0f@qP3TvIRVoufv)c8?&aw&B~1Y(02aUpDjK7B)cSkx8QDV zQMj_M+x+$UXOfa)nmweB@KP^Xm2R7$9(p;LCnufvW}*eG4R>Eak)Ei}%-KE8gsec^ zj=HuX z(qyBjd`DTC3ZeF2!np?{CKA-DtE=Op^zuqOJMFU}UTntQB1KKp81%{!bT~6heKA2v zt?`kF-Zi+k^YcNCz>V!+^RbV}r|Gp2j0+=crL`N5t}4tX=Ugo&7+C6ua?F4oX!wQ+)83@^vkY zDLFc>n(A(&_r09T&@t7l6XQ+b#6#=gA#14-D;h1Uq<(+=C8$D8`D^qmZ z9NOcdL`OIEho{GDl585|eQ0-*j0e6Rr=PNtyozBAqJr literal 0 HcmV?d00001 diff --git a/Maven/my-app/target/site/images/newwindow.png b/Maven/my-app/target/site/images/newwindow.png new file mode 100644 index 0000000000000000000000000000000000000000..6287f72bd08a870908e7361d98c35ee0d6dcbc82 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^+(699!3-oX?^2ToQY`6?zK#qG>ra@ocD)4hB}-f* zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%@dWsUxR#cd&SYTt4+aeuCvSob zD+%%o1`04ZXs!GLj7%Iec?BF2%&y2ZFfeUwWbk2P5nvW+xWT~4#-PT{uyM;F);OSv44$rjF6*2U FngH~|K)3(^ literal 0 HcmV?d00001 diff --git a/Maven/my-app/target/site/index.html b/Maven/my-app/target/site/index.html new file mode 100644 index 00000000..f972d528 --- /dev/null +++ b/Maven/my-app/target/site/index.html @@ -0,0 +1,102 @@ + + + + + + my-app - About + + + + + + + + + +
+ +
+
+
+
+

About my-app

+

There is currently no description associated with this project.

+
+
+
+
+
+ + + diff --git a/Maven/my-app/target/site/plugin-management.html b/Maven/my-app/target/site/plugin-management.html new file mode 100644 index 00000000..5d4e29de --- /dev/null +++ b/Maven/my-app/target/site/plugin-management.html @@ -0,0 +1,122 @@ + + + + + + my-app - Project Plugin Management + + + + + + + + + +
+ +
+
+
+
+

Project Plugin Management

+ + + + + + + + + + + + + + + + + + + + +
GroupIdArtifactIdVersion
org.apache.maven.pluginsmaven-antrun-plugin1.3
org.apache.maven.pluginsmaven-assembly-plugin2.2-beta-5
org.apache.maven.pluginsmaven-dependency-plugin2.8
org.apache.maven.pluginsmaven-release-plugin2.3.2
+
+
+
+
+
+ + + diff --git a/Maven/my-app/target/site/plugins.html b/Maven/my-app/target/site/plugins.html new file mode 100644 index 00000000..06aef6a2 --- /dev/null +++ b/Maven/my-app/target/site/plugins.html @@ -0,0 +1,141 @@ + + + + + + my-app - Project Build Plugins + + + + + + + + + +
+ +
+
+
+
+

Project Build Plugins

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GroupIdArtifactIdVersion
org.apache.maven.pluginsmaven-clean-plugin2.5
org.apache.maven.pluginsmaven-compiler-plugin3.1
org.apache.maven.pluginsmaven-deploy-plugin2.7
org.apache.maven.pluginsmaven-install-plugin2.4
org.apache.maven.pluginsmaven-jar-plugin2.4
org.apache.maven.pluginsmaven-resources-plugin2.6
org.apache.maven.pluginsmaven-site-plugin3.3
org.apache.maven.pluginsmaven-surefire-plugin2.12.4
+
+

Project Report Plugins

+

There are no plugins reports defined in the Reporting part of this project.

+
+
+
+
+
+ + + diff --git a/Maven/my-app/target/site/project-info.html b/Maven/my-app/target/site/project-info.html new file mode 100644 index 00000000..4953f0a1 --- /dev/null +++ b/Maven/my-app/target/site/project-info.html @@ -0,0 +1,129 @@ + + + + + + my-app - Project Information + + + + + + + + + +
+ +
+
+
+
+

Project Information

+

This document provides an overview of the various documents and links that are part of this project's general information. All of this content is automatically generated by Maven on behalf of the project.

+
+

Overview

+ + + + + + + + + + + + + + + + + + + + + + + + +
DocumentDescription
DependenciesThis document lists the project's dependencies and provides information on each dependency.
Dependency ConvergenceThis document presents the convergence of dependency versions across the entire project, and its sub modules.
Dependency InformationThis document describes how to to include this project as a dependency using various dependency management tools.
AboutThere is currently no description associated with this project.
Plugin ManagementThis document lists the plugins that are defined through pluginManagement.
Project PluginsThis document lists the build plugins and the report plugins used by this project.
Project SummaryThis document lists other related information of this project
+
+
+
+
+
+ + + diff --git a/Maven/my-app/target/site/project-summary.html b/Maven/my-app/target/site/project-summary.html new file mode 100644 index 00000000..7d2a1823 --- /dev/null +++ b/Maven/my-app/target/site/project-summary.html @@ -0,0 +1,140 @@ + + + + + + my-app - Project Summary + + + + + + + + + +
+ +
+
+
+
+

Project Summary

+
+

Project Information

+ + + + + + + + + + + + +
FieldValue
Namemy-app
Description-
Homepagehttp://maven.apache.org
+
+

Project Organization

+

This project does not belong to an organization.

+
+

Build Information

+ + + + + + + + + + + + + + + + + + +
FieldValue
GroupIdcom.mycompany.app
ArtifactIdmy-app
Version1.0-SNAPSHOT
Typejar
Java Version-
+
+
+
+
+
+ + + diff --git a/Maven/my-app/target/surefire-reports/TEST-com.mycompany.app.AppTest.xml b/Maven/my-app/target/surefire-reports/TEST-com.mycompany.app.AppTest.xml new file mode 100644 index 00000000..b22bd08d --- /dev/null +++ b/Maven/my-app/target/surefire-reports/TEST-com.mycompany.app.AppTest.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Maven/my-app/target/surefire-reports/com.mycompany.app.AppTest.txt b/Maven/my-app/target/surefire-reports/com.mycompany.app.AppTest.txt new file mode 100644 index 00000000..a7148d8a --- /dev/null +++ b/Maven/my-app/target/surefire-reports/com.mycompany.app.AppTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.mycompany.app.AppTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.034 sec diff --git a/Maven/my-webapp/.classpath b/Maven/my-webapp/.classpath new file mode 100644 index 00000000..98dac318 --- /dev/null +++ b/Maven/my-webapp/.classpath @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Maven/my-webapp/.metadata/.lock b/Maven/my-webapp/.metadata/.lock new file mode 100644 index 00000000..e69de29b diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.ant.ui/dialog_settings.xml b/Maven/my-webapp/.metadata/.plugins/org.eclipse.ant.ui/dialog_settings.xml new file mode 100644 index 00000000..5ca0b776 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.ant.ui/dialog_settings.xml @@ -0,0 +1,3 @@ + +
+
diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version new file mode 100644 index 00000000..25cb955b --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index new file mode 100644 index 0000000000000000000000000000000000000000..10c75e38d8073fa0fea2f45b71b842846e0a71b6 GIT binary patch literal 57 zcmZQ%U|?WmVAN+|WMUA>FG|--P0qyJm CSO?Dl literal 0 HcmV?d00001 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources new file mode 100644 index 0000000000000000000000000000000000000000..575ed9b907016f0f0f7f17720c8687c7c7145981 GIT binary patch literal 676 zcmZ?R*xjhShe1S2b=vdAllRFf=Oz}Hq!uZZBqrsgaw&(WrYLwN<|!B%Dj1qsnHX3Z z8!EW_hA0>r7@Be==cFbUxuoWlB*y0#rR$|8=VTTXr|K1?r0OLWWa^dV=jRmLrX}VS zr*fr$RJm3ZWELfsWaj6gsLx6%(M!%RO0_jKF*39;wJulUSOUoROKA4s`_{rCvDN0SXHNxcrkpGaBABgz<861LvpL?ozmmhN= NHAIa@Lll3A0sz5M^tb>3 literal 0 HcmV?d00001 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ant.ui.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ant.ui.prefs new file mode 100644 index 00000000..565f933d --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ant.ui.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +useAnnotationsPrefPage=true +useQuickDiffPrefPage=true diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..dffc6b51 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +version=1 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..52ff4730 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,14 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.classpathVariable.ECLIPSE_HOME=/usr/share/eclipse/ +org.eclipse.jdt.core.classpathVariable.JRE_LIB=/usr/lib/jvm/java-7-jdk/jre/lib/rt.jar +org.eclipse.jdt.core.classpathVariable.JRE_SRC=/usr/lib/jvm/java-7-jdk/src.zip +org.eclipse.jdt.core.classpathVariable.JRE_SRCROOT= +org.eclipse.jdt.core.classpathVariable.JUNIT_HOME=/usr/share/eclipse/plugins/org.junit_4.11.0.v201303080030/ +org.eclipse.jdt.core.classpathVariable.JUNIT_SRC_HOME=/usr/share/eclipse/plugins/org.junit.source_4.11.0.v201303080030.jar +org.eclipse.jdt.core.classpathVariable.M2_REPO=/home/meli/.m2 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs new file mode 100644 index 00000000..695f88c0 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.launching.PREF_VM_XML=\n\n\n\n\n\n diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000..650c36b0 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,13 @@ +content_assist_proposals_background=255,255,255 +content_assist_proposals_foreground=49,55,57 +eclipse.preferences.version=1 +fontPropagated=true +org.eclipse.jdt.ui.editor.tab.width= +org.eclipse.jdt.ui.formatterprofiles.version=12 +org.eclipse.jdt.ui.javadoclocations.migrated=true +org.eclipse.jface.textfont=1|Monospace|10.0|0|GTK|1|; +proposalOrderMigrated=true +spelling_locale_initialized=true +tabWidthPropagated=true +useAnnotationsPrefPage=true +useQuickDiffPrefPage=true diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.api.tools.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.api.tools.prefs new file mode 100644 index 00000000..d2ed6037 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.api.tools.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +knownEEFragments= diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.core.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.core.prefs new file mode 100644 index 00000000..adbe93e1 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +workspace_target_handle=local\:1421858174878.target diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs new file mode 100644 index 00000000..27a08ad4 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs @@ -0,0 +1,2 @@ +browsers=\n\n\n\n +eclipse.preferences.version=1 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs new file mode 100644 index 00000000..61f3bb8b --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +overviewRuler_migration=migrated_3.1 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs new file mode 100644 index 00000000..8e2f463c --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -0,0 +1,5 @@ +PROBLEMS_FILTERS_MIGRATE=true +eclipse.preferences.version=1 +platformState=1413759378246 +quickStart=false +tipsAndTricks=true diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs new file mode 100644 index 00000000..08076f23 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +showIntro=false diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/Maven/my-webapp/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi new file mode 100644 index 00000000..3b192c97 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -0,0 +1,1701 @@ + + + + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration + ModelMigrationProcessor.001 + + + + + + topLevel + + + + + persp.actionSet:org.eclipse.ui.cheatsheets.actionSet + persp.actionSet:org.eclipse.search.searchActionSet + persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation + persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation + persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo + persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet + persp.actionSet:org.eclipse.ui.actionSet.keyBindings + persp.actionSet:org.eclipse.ui.actionSet.openFiles + persp.actionSet:org.eclipse.debug.ui.launchActionSet + persp.actionSet:org.eclipse.jdt.ui.JavaActionSet + persp.actionSet:org.eclipse.jdt.ui.JavaElementCreationActionSet + persp.actionSet:org.eclipse.ui.NavigateActionSet + persp.viewSC:org.eclipse.jdt.ui.PackageExplorer + persp.viewSC:org.eclipse.jdt.ui.TypeHierarchy + persp.viewSC:org.eclipse.jdt.ui.SourceView + persp.viewSC:org.eclipse.jdt.ui.JavadocView + persp.viewSC:org.eclipse.search.ui.views.SearchView + persp.viewSC:org.eclipse.ui.console.ConsoleView + persp.viewSC:org.eclipse.ui.views.ContentOutline + persp.viewSC:org.eclipse.ui.views.ProblemView + persp.viewSC:org.eclipse.ui.views.ResourceNavigator + persp.viewSC:org.eclipse.ui.views.TaskList + persp.viewSC:org.eclipse.ui.views.ProgressView + persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer + persp.viewSC:org.eclipse.ui.texteditor.TemplatesView + persp.viewSC:org.eclipse.pde.runtime.LogView + persp.newWizSC:org.eclipse.jdt.ui.wizards.JavaProjectWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewPackageCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewClassCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewEnumCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard + persp.newWizSC:org.eclipse.ui.wizards.new.folder + persp.newWizSC:org.eclipse.ui.wizards.new.file + persp.newWizSC:org.eclipse.ui.editors.wizards.UntitledTextFileWizard + persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective + persp.perspSC:org.eclipse.debug.ui.DebugPerspective + persp.viewSC:org.eclipse.ant.ui.views.AntView + persp.showIn:org.eclipse.egit.ui.RepositoriesView + persp.actionSet:org.eclipse.debug.ui.breakpointActionSet + persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet + persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard + persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet + persp.showIn:org.eclipse.jdt.ui.PackageExplorer + persp.showIn:org.eclipse.team.ui.GenericHistoryView + persp.showIn:org.eclipse.ui.views.ResourceNavigator + persp.showIn:org.eclipse.ui.navigator.ProjectExplorer + + + + newtablook + org.eclipse.e4.primaryNavigationStack + active + noFocus + + + + + + + + newtablook + + + + + + + + newtablook + org.eclipse.e4.secondaryNavigationStack + + + + + + + newtablook + org.eclipse.e4.secondaryDataStack + + + + + + + + + + + + + + + + + + + + View + categoryTag:Help + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + View + categoryTag:Help + + + + newtablook + org.eclipse.e4.primaryDataStack + EditorStack + + + + + View + categoryTag:Java + active + activeOnClose + + ViewMenu + menuContribution:menu + + + + + View + categoryTag:Java + + + View + categoryTag:General + + + View + categoryTag:General + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + View + categoryTag:Java + + + View + categoryTag:Java + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + View + categoryTag:General + + + View + categoryTag:Ant + + + View + categoryTag:Git + + + View + categoryTag:Java + + + + toolbarSeparator + + + + Draggable + + + + toolbarSeparator + + + + Draggable + + + Draggable + + + Draggable + + + toolbarSeparator + + + + Draggable + + + + toolbarSeparator + + + + toolbarSeparator + + + + Draggable + + + stretch + SHOW_RESTORE_MENU + + + Draggable + HIDEABLE + SHOW_RESTORE_MENU + + + + + stretch + + + Draggable + + + Draggable + + + + + TrimStack + + + + + + + + + + + + + + + + platform:gtk + + + + platform:gtk + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor + + + View + categoryTag:Ant + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Debug + + + View + categoryTag:Git + + + View + categoryTag:Git + + + View + categoryTag:Git + + + View + categoryTag:Git + + + View + categoryTag:Git + + + View + categoryTag:Help + + + View + categoryTag:Debug + + + View + categoryTag:Java + + + View + categoryTag:Java + + + View + categoryTag:Java + + + View + categoryTag:Java Browsing + + + View + categoryTag:Java Browsing + + + View + categoryTag:Java Browsing + + + View + categoryTag:Java Browsing + + + View + categoryTag:Java + + + View + categoryTag:General + + + View + categoryTag:Java + + + View + categoryTag:Java + + + View + categoryTag:API Tools + + + View + categoryTag:Plug-in Development + + + View + categoryTag:Plug-in Development + + + View + categoryTag:Plug-in Development + + + View + categoryTag:Plug-in Development + + + View + categoryTag:Plug-in Development + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:CVS + + + View + categoryTag:CVS + + + View + categoryTag:Team + + + View + categoryTag:Team + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:Help + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + View + categoryTag:General + + + + glue + move_after:PerspectiveSpacer + SHOW_RESTORE_MENU + + + move_after:Spacer Glue + HIDEABLE + SHOW_RESTORE_MENU + + + glue + move_after:SearchField + SHOW_RESTORE_MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache new file mode 100644 index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 GIT binary patch literal 4 LcmZQzU|;|M00aO5 literal 0 HcmV?d00001 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache new file mode 100644 index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 GIT binary patch literal 4 LcmZQzU|;|M00aO5 literal 0 HcmV?d00001 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache new file mode 100644 index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 GIT binary patch literal 4 LcmZQzU|;|M00aO5 literal 0 HcmV?d00001 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache new file mode 100644 index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 GIT binary patch literal 4 LcmZQzU|;|M00aO5 literal 0 HcmV?d00001 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat new file mode 100644 index 0000000000000000000000000000000000000000..1a3229e37ed9d07bb0e36028312d573758d09cdc GIT binary patch literal 399 zcma)2O;5r=5FPQO3dqGDz|9*w+hU^eC~iUtSW@uZ)VhIPTiWc>9{lz06vGJ<=P;Am zee>qM0e}u1!fT5+i$$`EC)Aw55Nm5NS0AXG0(IJ?qsNi{{6cFo_N^)h>Ofyi=HYTB zl4-OMGWWpKfC8+UjP6A literal 0 HcmV?d00001 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml new file mode 100644 index 00000000..5bc60fa1 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml @@ -0,0 +1,4 @@ + + + + diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml new file mode 100644 index 00000000..ade4ba3c --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml new file mode 100644 index 00000000..a4ee3cbc --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml @@ -0,0 +1,2 @@ + + diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml new file mode 100644 index 00000000..9e390f50 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -0,0 +1,2 @@ + + diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml new file mode 100644 index 00000000..fdb4217e --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -0,0 +1,11 @@ + +
+ +
+ + + + + +
+
diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.api.tools.ui/dialog_settings.xml b/Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.api.tools.ui/dialog_settings.xml new file mode 100644 index 00000000..3cf26322 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.api.tools.ui/dialog_settings.xml @@ -0,0 +1,17 @@ + +
+
+ + + + + + + + + + + + +
+
diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties b/Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties new file mode 100644 index 00000000..fb36ac90 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties @@ -0,0 +1,2 @@ +#Cached timestamps +#Wed Jan 21 16:40:32 GMT 2015 diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.core/.local_targets/1421858174878.target b/Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.core/.local_targets/1421858174878.target new file mode 100644 index 00000000..e2bb8abf --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.pde.core/.local_targets/1421858174878.target @@ -0,0 +1,15 @@ + + + + + + +linux +gtk +x86_64 +es_AR + + +-Dosgi.requiredJavaVersion=1.7 -XX:MaxPermSize=256m -Xms40m -Xmx512m + + diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml b/Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml new file mode 100644 index 00000000..50f1edb3 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml @@ -0,0 +1,5 @@ + +
+
+
+
diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml new file mode 100644 index 00000000..665660d8 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -0,0 +1,21 @@ + +
+
+ + + + + + + + + + +
+
+ + +
+
+
+
diff --git a/Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml new file mode 100644 index 00000000..e5f5ea64 --- /dev/null +++ b/Maven/my-webapp/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Maven/my-webapp/.metadata/version.ini b/Maven/my-webapp/.metadata/version.ini new file mode 100644 index 00000000..8d946089 --- /dev/null +++ b/Maven/my-webapp/.metadata/version.ini @@ -0,0 +1,3 @@ +#Wed Jan 21 16:35:49 GMT 2015 +org.eclipse.core.runtime=2 +org.eclipse.platform=4.4.0.v20140925-0400 diff --git a/Maven/my-webapp/.project b/Maven/my-webapp/.project new file mode 100644 index 00000000..17690345 --- /dev/null +++ b/Maven/my-webapp/.project @@ -0,0 +1,14 @@ + + + my-webapp + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file diff --git a/Maven/my-webapp/pom.xml b/Maven/my-webapp/pom.xml new file mode 100644 index 00000000..b6e7f8aa --- /dev/null +++ b/Maven/my-webapp/pom.xml @@ -0,0 +1,35 @@ + + 4.0.0 + com.mycompany.app + my-webapp + war + 1.0-SNAPSHOT + my-webapp Maven Webapp + http://maven.apache.org + + + junit + junit + 3.8.1 + test + + + com.mycompany.app + my-app + 1.0-SNAPSHOT + + + + my-webapp + + + org.mortbay.jetty + maven-jetty-plugin + + 3 + + + + + diff --git a/Maven/my-webapp/src/main/webapp/WEB-INF/web.xml b/Maven/my-webapp/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 00000000..9f88c1f9 --- /dev/null +++ b/Maven/my-webapp/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,7 @@ + + + + Archetype Created Web Application + diff --git a/Maven/my-webapp/src/main/webapp/index.jsp b/Maven/my-webapp/src/main/webapp/index.jsp new file mode 100644 index 00000000..c38169bb --- /dev/null +++ b/Maven/my-webapp/src/main/webapp/index.jsp @@ -0,0 +1,5 @@ + + +

Hello World!

+ + diff --git a/Maven/my-webapp/target/maven-archiver/pom.properties b/Maven/my-webapp/target/maven-archiver/pom.properties new file mode 100644 index 00000000..1f13e562 --- /dev/null +++ b/Maven/my-webapp/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Jan 21 22:26:14 GMT 2015 +version=1.0-SNAPSHOT +groupId=com.mycompany.app +artifactId=my-webapp diff --git a/Maven/my-webapp/target/my-webapp/WEB-INF/web.xml b/Maven/my-webapp/target/my-webapp/WEB-INF/web.xml new file mode 100644 index 00000000..9f88c1f9 --- /dev/null +++ b/Maven/my-webapp/target/my-webapp/WEB-INF/web.xml @@ -0,0 +1,7 @@ + + + + Archetype Created Web Application + diff --git a/Maven/my-webapp/target/my-webapp/index.jsp b/Maven/my-webapp/target/my-webapp/index.jsp new file mode 100644 index 00000000..c38169bb --- /dev/null +++ b/Maven/my-webapp/target/my-webapp/index.jsp @@ -0,0 +1,5 @@ + + +

Hello World!

+ + diff --git a/Maven/pom.xml b/Maven/pom.xml new file mode 100644 index 00000000..93767fe6 --- /dev/null +++ b/Maven/pom.xml @@ -0,0 +1,17 @@ + + 4.0.0 + + com.mycompany.app + app + 1.0-SNAPSHOT + pom + + + my-app + my-webapp + + + diff --git a/Topic1_Audio_Player/src/State.java b/Topic1_Audio_Player/src/AudioPlayerCommand.java similarity index 100% rename from Topic1_Audio_Player/src/State.java rename to Topic1_Audio_Player/src/AudioPlayerCommand.java From 71773d44d8a718c4458964a861324cdd157e7e8e Mon Sep 17 00:00:00 2001 From: Melina Urruchua Date: Sun, 25 Jan 2015 20:38:28 -0300 Subject: [PATCH 4/4] updating changes Topic 1 --- Topic1/src/Client.java | 3 ++- Topic1/src/MarketManager.java | 2 +- Topic1/src/ShoppingCart.java | 4 ++-- Topic1_Audio_Player/src/AudioPlayerCommand.java | 4 ++-- Topic1_Audio_Player/src/PauseState.java | 8 ++++---- Topic1_Audio_Player/src/PlayState.java | 8 ++++---- Topic1_Audio_Player/src/Playlist.java | 16 ++++++++-------- Topic1_Audio_Player/src/StopState.java | 8 ++++---- Topic1_Audio_Player/src/Strategy.java | 2 +- Topic1_Audio_Player/src/TrackContainer.java | 12 ++++++------ Topic1_Audio_Player/src/TrackSong.java | 4 ++-- 11 files changed, 36 insertions(+), 35 deletions(-) diff --git a/Topic1/src/Client.java b/Topic1/src/Client.java index 52f50100..64ec00c7 100644 --- a/Topic1/src/Client.java +++ b/Topic1/src/Client.java @@ -30,8 +30,9 @@ public void payment(int c) { public String showCart(String idCart) { for (ShoppingCart cart: carts){ - if (idCart.equals(cart.getIdCart())) + if (idCart.equals(cart.getIdCart())){ return cart.showProducts(); + } } return null; } diff --git a/Topic1/src/MarketManager.java b/Topic1/src/MarketManager.java index 0470605a..acf03a23 100644 --- a/Topic1/src/MarketManager.java +++ b/Topic1/src/MarketManager.java @@ -34,7 +34,7 @@ public void update(String g) { notice.add(g); } - public MarketManager getInstance() { + public static MarketManager getInstance() { if(instance==null) { instance = new MarketManager(); } diff --git a/Topic1/src/ShoppingCart.java b/Topic1/src/ShoppingCart.java index 1a59f083..f9f3d264 100644 --- a/Topic1/src/ShoppingCart.java +++ b/Topic1/src/ShoppingCart.java @@ -12,9 +12,9 @@ public class ShoppingCart implements Subject{ private Sequence counter = Sequence.getInstance(); - public ShoppingCart(String id,MarketManager m){ + public ShoppingCart(String id){ setIdCart(id); - addObserver(m.getInstance()); //add observer + addObserver(MarketManager.getInstance()); //add observer } public void addProduct(IOffer e){ diff --git a/Topic1_Audio_Player/src/AudioPlayerCommand.java b/Topic1_Audio_Player/src/AudioPlayerCommand.java index c92122ad..26689d3a 100644 --- a/Topic1_Audio_Player/src/AudioPlayerCommand.java +++ b/Topic1_Audio_Player/src/AudioPlayerCommand.java @@ -1,4 +1,4 @@ -public interface State { - public void goNext(playlist p,String nextstate); +public interface AudioPlayerCommand { + public void goNext(Playlist p,String nextstate); } diff --git a/Topic1_Audio_Player/src/PauseState.java b/Topic1_Audio_Player/src/PauseState.java index 2c020f3c..99a86d7d 100644 --- a/Topic1_Audio_Player/src/PauseState.java +++ b/Topic1_Audio_Player/src/PauseState.java @@ -1,16 +1,16 @@ -public class pauseState implements State{ +public class PauseState implements AudioPlayerCommand{ String current = "pause"; @Override - public void goNext(playlist p,String nextstate) { + public void goNext(Playlist p,String nextstate) { if("play".equals(nextstate)){ - State playstate = new playState(); + AudioPlayerCommand playstate = new PlayState(); p.setState(playstate); System.out.println("Play mode: " + p.getCurrentSong()); } else{ - State stopstate = new stopState(); + AudioPlayerCommand stopstate = new StopState(); p.setState(stopstate); System.out.println("Stop mode."); } diff --git a/Topic1_Audio_Player/src/PlayState.java b/Topic1_Audio_Player/src/PlayState.java index 782dca38..db42d16b 100644 --- a/Topic1_Audio_Player/src/PlayState.java +++ b/Topic1_Audio_Player/src/PlayState.java @@ -1,16 +1,16 @@ -public class playState implements State{ +public class PlayState implements AudioPlayerCommand{ String current = "play"; @Override - public void goNext(playlist p,String nextstate) { + public void goNext(Playlist p,String nextstate) { if("pause".equals(nextstate)){ - State pausestate = new pauseState(); + AudioPlayerCommand pausestate = new PauseState(); p.setState(pausestate); System.out.println("Pause mode."); } else{ - State stopstate = new stopState(); + AudioPlayerCommand stopstate = new StopState(); p.setState(stopstate); System.out.println("Stop mode."); } diff --git a/Topic1_Audio_Player/src/Playlist.java b/Topic1_Audio_Player/src/Playlist.java index e7a3bdb9..86354c61 100644 --- a/Topic1_Audio_Player/src/Playlist.java +++ b/Topic1_Audio_Player/src/Playlist.java @@ -3,18 +3,18 @@ import java.util.List; -public class playlist extends trackContainer{ - private State state; +public class Playlist extends TrackContainer{ + private AudioPlayerCommand state; - private List songs= new ArrayList(); + private List songs= new ArrayList(); private String currentSong; - public playlist(String name) { + public Playlist(String name) { super(name); } - public void addTrack(trackSong track){ + public void addTrack(TrackSong track){ songs.add(track); } @@ -22,7 +22,7 @@ public void goNext(String nextstate){ state.goNext(this,nextstate); } - public void setState(State s){ + public void setState(AudioPlayerCommand s){ this.state=s; } @@ -30,9 +30,9 @@ public void reproduction() throws InterruptedException{ boolean on=true; while (on){ boolean onrandom=true; - Iterator it = songs.iterator(); + Iterator it = songs.iterator(); while (it.hasNext() && on) { - trackSong track = it.next(); + TrackSong track = it.next(); currentSong=track.getName(); while (onrandom){ int r= (int) Math.random(); diff --git a/Topic1_Audio_Player/src/StopState.java b/Topic1_Audio_Player/src/StopState.java index 0a4e886e..6ca9ff2d 100644 --- a/Topic1_Audio_Player/src/StopState.java +++ b/Topic1_Audio_Player/src/StopState.java @@ -1,16 +1,16 @@ -public class stopState implements State{ +public class StopState implements AudioPlayerCommand{ String current = "stop"; @Override - public void goNext(playlist p,String nextstate) { + public void goNext(Playlist p,String nextstate) { if("pause".equals(nextstate)){ - State pausestate = new pauseState(); + AudioPlayerCommand pausestate = new PauseState(); p.setState(pausestate); System.out.println("Pause mode."); } else{ - State playstate = new playState(); + AudioPlayerCommand playstate = new PlayState(); p.setState(playstate); System.out.println("Play mode: " + p.getCurrentSong()); } diff --git a/Topic1_Audio_Player/src/Strategy.java b/Topic1_Audio_Player/src/Strategy.java index ec65d2ea..6c9b4166 100644 --- a/Topic1_Audio_Player/src/Strategy.java +++ b/Topic1_Audio_Player/src/Strategy.java @@ -1,4 +1,4 @@ public interface Strategy { - public void filterSong(playlist list); + public void filterSong(Playlist list); } diff --git a/Topic1_Audio_Player/src/TrackContainer.java b/Topic1_Audio_Player/src/TrackContainer.java index 0dfa3ac4..96829a46 100644 --- a/Topic1_Audio_Player/src/TrackContainer.java +++ b/Topic1_Audio_Player/src/TrackContainer.java @@ -2,12 +2,12 @@ import java.util.List; -public class trackContainer { +public class TrackContainer { private String name; protected int totalTimeInSec; - protected List songs= new ArrayList(); + protected List songs= new ArrayList(); - public trackContainer(String name){ + public TrackContainer(String name){ this.name=name; this.totalTimeInSec=0; } @@ -21,7 +21,7 @@ public void setName(String name) { } public int getTotalTimeInSec(){ - for (trackSong song: songs){ + for (TrackSong song: songs){ totalTimeInSec+=song.getDurationInSec(); } return totalTimeInSec; @@ -31,11 +31,11 @@ public void setTotalTimeInSec(int totalTimeInSec) { this.totalTimeInSec = totalTimeInSec; } - public void addTrack(trackSong track){ + public void addTrack(TrackSong track){ songs.add(track); } - public void removeTrack(trackSong track){ + public void removeTrack(TrackSong track){ songs.remove(track); } diff --git a/Topic1_Audio_Player/src/TrackSong.java b/Topic1_Audio_Player/src/TrackSong.java index 9d38c525..34dac3ef 100644 --- a/Topic1_Audio_Player/src/TrackSong.java +++ b/Topic1_Audio_Player/src/TrackSong.java @@ -1,11 +1,11 @@ -public class trackSong { +public class TrackSong { private String name; private String author; private int durationInSec; private String album; - public trackSong(String name,String author,int durationInSec,String album){ + public TrackSong(String name,String author,int durationInSec,String album){ this.setName(name); this.setAuthor(author); this.setDurationInSec(durationInSec);