diff -Nru liblittleframe-java-1/build.xml liblittleframe-java-1.1/build.xml
--- liblittleframe-java-1/build.xml 2015-10-14 22:36:05.000000000 +0000
+++ liblittleframe-java-1.1/build.xml 2015-10-18 08:18:33.000000000 +0000
@@ -3,7 +3,7 @@
-
+
@@ -27,7 +27,12 @@
-
+
+
+
+
+
+
diff -Nru liblittleframe-java-1/changelog liblittleframe-java-1.1/changelog
--- liblittleframe-java-1/changelog 2015-10-11 14:03:23.000000000 +0000
+++ liblittleframe-java-1.1/changelog 2015-10-19 08:27:55.000000000 +0000
@@ -1,5 +1,9 @@
-protocol version 1:
-Découverte et intéraction avec différents protocoles : upnp, airplay, chromecast
-upnp : découverte et intéraction opérationnelles
-airplay : découverte opérationnelle
-chromecast : découverte et intéraction opérationnelles
\ No newline at end of file
+littleframe version 1.1 :
+information non fonctionnel
+bug fix : ajout des images au jar
+
+littleframe version 1 :
+About non fonctionnel
+AskFile fonctionnel
+DoYouWant non fonctionnel
+WaitDevice fonctionnel
\ No newline at end of file
diff -Nru liblittleframe-java-1/debian/changelog liblittleframe-java-1.1/debian/changelog
--- liblittleframe-java-1/debian/changelog 2015-10-14 23:16:44.000000000 +0000
+++ liblittleframe-java-1.1/debian/changelog 2015-10-19 08:31:38.000000000 +0000
@@ -1,3 +1,9 @@
+liblittleframe-java (1.1-0ubuntu1) vivid; urgency=medium
+
+ * bug fix : ajout des images au jar
+
+ -- Jonathan Le Greneur Mon, 19 Oct 2015 10:31:10 +0200
+
liblittleframe-java (1-0ubuntu1) vivid; urgency=low
* Initial release
diff -Nru liblittleframe-java-1/debian/liblittleframe-java.install liblittleframe-java-1.1/debian/liblittleframe-java.install
--- liblittleframe-java-1/debian/liblittleframe-java.install 2015-10-14 23:19:34.000000000 +0000
+++ liblittleframe-java-1.1/debian/liblittleframe-java.install 2015-10-19 08:31:56.000000000 +0000
@@ -1 +1 @@
-jar/littleframe-1.jar usr/share/java
+jar/littleframe-1.1.jar usr/share/java
diff -Nru liblittleframe-java-1/debian/liblittleframe-java.links liblittleframe-java-1.1/debian/liblittleframe-java.links
--- liblittleframe-java-1/debian/liblittleframe-java.links 2015-10-14 23:20:44.000000000 +0000
+++ liblittleframe-java-1.1/debian/liblittleframe-java.links 2015-10-19 08:32:05.000000000 +0000
@@ -1 +1 @@
-usr/share/java/littleframe-1.jar usr/share/java/littleframe.jar
+usr/share/java/littleframe-1.1.jar usr/share/java/littleframe.jar
diff -Nru liblittleframe-java-1/druzy/littleframe/AskFiles.java liblittleframe-java-1.1/druzy/littleframe/AskFiles.java
--- liblittleframe-java-1/druzy/littleframe/AskFiles.java 2015-09-28 21:51:58.000000000 +0000
+++ liblittleframe-java-1.1/druzy/littleframe/AskFiles.java 2015-10-17 15:20:33.000000000 +0000
@@ -17,7 +17,6 @@
public AskFiles(FileFilter filter){
this(new AskFilesModel(filter));
-
}
@Override
diff -Nru liblittleframe-java-1/druzy/littleframe/Global.java liblittleframe-java-1.1/druzy/littleframe/Global.java
--- liblittleframe-java-1/druzy/littleframe/Global.java 2015-10-11 16:59:28.000000000 +0000
+++ liblittleframe-java-1.1/druzy/littleframe/Global.java 2015-10-18 08:16:33.000000000 +0000
@@ -4,7 +4,7 @@
public class Global {
- public static final Version VERSION=new Version("1");
+ public static final Version VERSION=new Version("1.1");
private Global() {}
Binary files /tmp/D3wTKcjGom/liblittleframe-java-1/druzy/littleframe/image/wait.gif and /tmp/3usiuaC4qL/liblittleframe-java-1.1/druzy/littleframe/image/wait.gif differ
diff -Nru liblittleframe-java-1/druzy/littleframe/Information.java liblittleframe-java-1.1/druzy/littleframe/Information.java
--- liblittleframe-java-1/druzy/littleframe/Information.java 1970-01-01 00:00:00.000000000 +0000
+++ liblittleframe-java-1.1/druzy/littleframe/Information.java 2015-10-18 08:49:25.000000000 +0000
@@ -0,0 +1,32 @@
+package druzy.littleframe;
+
+import java.io.File;
+
+import druzy.mvc.AbstractController;
+import druzy.mvc.Model;
+import druzy.mvc.View;
+
+public class Information extends AbstractController {
+
+ public Information(Model model) {
+ super(model);
+ this.addView(new InformationView(this));
+ }
+
+ public Information(String information){
+ this(new InformationModel(information));
+ }
+
+ public Information(File file){
+ this(new InformationModel(file));
+ }
+
+ @Override
+ public void notifyAction(View view, Object[] info, int action) {
+
+ }
+
+ @Override
+ public InformationModel getModel(){return (InformationModel)super.getModel();}
+
+}
diff -Nru liblittleframe-java-1/druzy/littleframe/InformationModel.java liblittleframe-java-1.1/druzy/littleframe/InformationModel.java
--- liblittleframe-java-1/druzy/littleframe/InformationModel.java 1970-01-01 00:00:00.000000000 +0000
+++ liblittleframe-java-1.1/druzy/littleframe/InformationModel.java 2015-10-18 08:56:55.000000000 +0000
@@ -0,0 +1,29 @@
+package druzy.littleframe;
+
+import java.io.File;
+
+import druzy.mvc.AbstractModel;
+import druzy.utils.FileUtils;
+
+public class InformationModel extends AbstractModel {
+
+ private String information=null;
+
+ public InformationModel(String information) {
+ super();
+ this.information=information;
+ }
+
+ public InformationModel(File file){
+ this(FileUtils.getText(file));
+ }
+
+ public String getInformation() {
+ return information;
+ }
+
+ public void setInformation(String information) {
+ this.information = information;
+ }
+
+}
diff -Nru liblittleframe-java-1/druzy/littleframe/InformationView.java liblittleframe-java-1.1/druzy/littleframe/InformationView.java
--- liblittleframe-java-1/druzy/littleframe/InformationView.java 1970-01-01 00:00:00.000000000 +0000
+++ liblittleframe-java-1.1/druzy/littleframe/InformationView.java 2015-10-18 08:58:16.000000000 +0000
@@ -0,0 +1,96 @@
+package druzy.littleframe;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.beans.PropertyChangeEvent;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.SwingUtilities;
+
+import druzy.mvc.AbstractView;
+import druzy.mvc.Controller;
+
+public class InformationView extends AbstractView {
+
+ private GridBagLayout layout=null;
+ private JFrame informationFrame=null;
+ private JLabel infoLabel=null;
+ private JButton ok=null;
+
+ public InformationView(Controller controller) {
+ super(controller);
+
+ try {
+ SwingUtilities.invokeAndWait(new Runnable(){
+ public void run(){
+ layout=new GridBagLayout();
+
+ informationFrame=new JFrame();
+ informationFrame.setLayout(layout);
+
+ infoLabel=new JLabel(getController().getModel().getInformation());
+
+ ok=new JButton("OK");
+
+ //ajout des composant les uns les autres
+ GridBagConstraints c=new GridBagConstraints();
+ c.gridx=0;
+ c.gridy=0;
+ informationFrame.add(infoLabel,c);
+
+ c.gridy++;
+ informationFrame.add(ok,c);
+
+ }
+ });
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onTop() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void propertyChange(PropertyChangeEvent pce) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void display() {
+ SwingUtilities.invokeLater(new Runnable(){
+ public void run(){
+ informationFrame.setVisible(true);
+ }
+ });
+
+ }
+
+ @Override
+ public boolean isDisplaying() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void close() {
+ SwingUtilities.invokeLater(new Runnable(){
+ public void run(){
+ informationFrame.setVisible(false);
+ informationFrame.dispose();
+ }
+ });
+ }
+
+ @Override
+ public Information getController(){return (Information)super.getController();}
+}
diff -Nru liblittleframe-java-1/druzy/littleframe/WaitDeviceModel.java liblittleframe-java-1.1/druzy/littleframe/WaitDeviceModel.java
--- liblittleframe-java-1/druzy/littleframe/WaitDeviceModel.java 2015-09-28 21:36:23.000000000 +0000
+++ liblittleframe-java-1.1/druzy/littleframe/WaitDeviceModel.java 2015-10-18 08:16:10.000000000 +0000
@@ -6,7 +6,7 @@
public class WaitDeviceModel extends AbstractModel {
- public static ImageIcon WAIT_GIF=new ImageIcon(ClassLoader.getSystemResource("image/wait.gif"));
+ public static ImageIcon WAIT_GIF=new ImageIcon(ClassLoader.getSystemResource("druzy/littleframe/image/wait.gif"));
public WaitDeviceModel() {
// TODO Auto-generated constructor stub
diff -Nru liblittleframe-java-1/druzy/littleframe/WaitDeviceView.java liblittleframe-java-1.1/druzy/littleframe/WaitDeviceView.java
--- liblittleframe-java-1/druzy/littleframe/WaitDeviceView.java 2015-09-28 21:36:53.000000000 +0000
+++ liblittleframe-java-1.1/druzy/littleframe/WaitDeviceView.java 2015-10-18 08:56:29.000000000 +0000
@@ -83,8 +83,11 @@
@Override
public void display() {
- waitFrame.setVisible(true);
-
+ SwingUtilities.invokeLater(new Runnable(){
+ public void run(){
+ waitFrame.setVisible(true);
+ }
+ });
}
@Override
@@ -94,9 +97,12 @@
@Override
public void close() {
- waitFrame.setVisible(false);
- waitFrame.dispose();
-
+ SwingUtilities.invokeLater(new Runnable(){
+ public void run(){
+ waitFrame.setVisible(false);
+ waitFrame.dispose();
+ }
+ });
}
}
Binary files /tmp/D3wTKcjGom/liblittleframe-java-1/image/wait.gif and /tmp/3usiuaC4qL/liblittleframe-java-1.1/image/wait.gif differ