Changeset 158

Timestamp:

03/08/07 22:01:09 (2 years ago)

Author:

bfitzpa2

Message:

Next button now works and the flash itself calls the next song when it's done.

Files:

• dmp/trunk/gwt-windows-1.3.3/src/DMP/client/DMPWebsite.java (modified) (7 diffs)
• dmp/trunk/gwt-windows-1.3.3/src/DMP/server/MusicServImpl.java (modified) (9 diffs)

dmp/trunk/gwt-windows-1.3.3/src/DMP/client/DMPWebsite.java

@@ -2 +2 @@
-
-import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.*;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.rpc.*;
-Timer
+*
-import java.util.Vector;
-import java.util.HashMap;
@@ -19 +19 @@
-        SongTable playing = new PlayingTable(this);
-        DockPanel mainPanel = new DockPanel();
-
+
+
+
+
-        int currentMusicDuration = 0;
-        Date currentSongStart = null;
-
+String testString = "This is a test.";
-        
-        public void onClick(Widget w)
@@ -73 +76 @@
-                String moduleRelativeURL = GWT.getModuleBaseURL() + "music";
-                endpoint.setServiceEntryPoint(moduleRelativeURL);
-
+
+
+
+
+
-                getSongsFromCollection();
-
@@ -90 +97 @@
-                
-                HorizontalPanel topPanel = new HorizontalPanel();
-
+
+
+
+
+
-                topPanel.add(logo);
+                
+                // the panel containing the flash movie and html navigation links
+                flashPanel = new DeckPanel();
+                Hyperlink nextSongLink = new Hyperlink("Next Song",false,"");
+                nextSongLink.addClickListener(new ClickListener(){
+                        public void onClick(Widget w)
+                        {
+                                playNextSong();
+                        }
+                });
+                flashPanel.add(nextSongLink);
+                GWT.log(nextSongLink.getElement().toString(), null);
+                SimplePanel placeholder = new SimplePanel();
+                flashPanel.add(placeholder); // add a blank panel as a placeholder
+                flashPanel.showWidget(flashPanel.getWidgetIndex(placeholder));
-                topPanel.add(flashPanel);
+                
+                // button to refresh songs from the collection
-                Button refreshButton = new Button("Refresh");
-                refreshButton.addClickListener(new ClickListener(){
@@ -143 +171 @@
-        public void playNextSong()
-        {
+                GWT.log("playNextSong in DMPWebsite", null);
-                final boolean firstSong = (currentMusicDuration == 0);
-                musicServ.getNextSong(new AsyncCallback(){
@@ -158 +187 @@
-                                        return;
-                                }
-
+
+
+
-                                                "<param name=\"movie\" value=\"" + path + "\"><PARAM NAME=loop VALUE=\"false\">" + 
-                                                "<PARAM NAME=menu VALUE=\"true\">" +
-                                                "<embed src=\"" + path + 
-100\" height=\"10
+50\" height=\"5
-                                                "</embed></object>");
-
+
+
-                                currentMusicDuration = Double.valueOf((String)song.get("duration")).intValue();
-                                if(firstSong)
-                                {
-
-
+//
+//
-                                }
-                                playing.removeSong(song.get("id"));
@@ -215 +247 @@
-                }
-        }
+        
+        /**
+         * Javascript initialization method.
+         */
+        public native void initJavascriptAPI(DMPWebsite site)/*-{
+                $wnd.nextSong = function() { site.@DMP.client.DMPWebsite::playNextSong()(); }
+        }-*/;
-}

dmp/trunk/gwt-windows-1.3.3/src/DMP/server/MusicServImpl.java

@@ -29 +29 @@
-        private DMPXmlRpcClient client;
-        private HashMap<HashMap,File> flashFileHandles = new HashMap<HashMap,File>();
+        private String graphicsPath = "C:\\Documents and Settings\\Beverly Fitzpatrick\\My" + 
+        " Documents\\Visual Studio 2005\\Projects\\DMPGraphics\\";
-        
-        // testing method
@@ -46 +48 @@
-        }
-        
-        // Need to figure out how to notify webpage that the song is now playing
-        public HashMap getNextSong()
-        {
@@ -55 +56 @@
-                        song.put("duration",0);
-                        return song;
+                }
+                while(!flashFileHandles.containsKey(song))
+                {
+                        try {
+                                Thread.sleep(100);
+                        } catch (InterruptedException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
-                }
-                File songHandle = flashFileHandles.get(song);
@@ -209 +219 @@
-        {
-                int framesPerSecond = 12;
-930,93
+1000,100
-                musicMov.add(new FSSetBackgroundColor(new FSColor(255,200,255))); // random color for testing
+                FSGetUrl nextSongAction = new FSGetUrl("javascript:nextSong()");
-
-                // make the sound
@@ -232 +243 @@
-                
-                // make the next button
-                String imageBasePath = "C:\\Documents and Settings\\Beverly Fitzpatrick\\My" + 
-                        " Documents\\Visual Studio 2005\\Projects\\DMPGraphics\\";
-                FSImageConstructor imageMaker = new FSImageConstructor();
-                FSDefineObject nextHover;
@@ -239 +248 @@
-                FSDefineObject nextPressed;
-                try {
-imageBase
+graphics
-                        nextHover = imageMaker.defineImage(musicMov.newIdentifier());
-imageBase
+graphics
-                        nextNoHover = imageMaker.defineImage(musicMov.newIdentifier());
-imageBase
+graphics
-                        nextPressed = imageMaker.defineImage(musicMov.newIdentifier());
-                } catch (IOException e2) {
@@ -253 +262 @@
-                }
-                FSDefineShape3 nextNoHoverShape = imageMaker.defineEnclosingShape(musicMov.newIdentifier(),
-5,5,5
+0,0,10
-                FSDefineShape3 nextHoverShape = imageMaker.defineEnclosingShape(musicMov.newIdentifier(),
-ull
+ew FSSolidLine(1,new FSColor(10,0,0))
-                FSDefineShape3 nextPressedShape = imageMaker.defineEnclosingShape(musicMov.newIdentifier(),
-ull
+ew FSSolidLine(1,new FSColor(0,10,0))
-
-                // make the buttons
-
-
-
-
+
+
+
+
+
-                
-                // button actions
-
+
+
-                
-                // define the button and add it to the movie
-                FSDefineButton nextButton = new FSDefineButton(musicMov.newIdentifier(), 
-
+
+
-                musicMov.add(nextHover);
-                musicMov.add(nextNoHover);
@@ -279 +291 @@
-                musicMov.add(nextButton);
-                musicMov.add(new FSPlaceObject(nextButton.getIdentifier(), 1, 0, 0));
+                // done making the button and placing it in the movie
-                
-                int samplesPerBlock;
@@ -298 +311 @@
-                        if(i == numberOfBlocks - 1) // adds a stop action to the last frame of the movie
-                        {
-> actions = new ArrayList<FSAction
+Object> actions = new ArrayList<FSActionObject
-                                actions.add(new FSAction(FSAction.Stop));
+                                actions.add(nextSongAction);
-                                FSDoAction action = new FSDoAction(actions);
-                                musicMov.add(action);