deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixes possible ambiguous compilation error by explicitly casting null

Browse source
This commit is contained in:
fros4943 2007-01-10 08:48:13 +00:00
parent a812d1927b
commit 30e0584ec5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteTypeDialog.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: ContikiMoteTypeDialog.java,v 1.14 2007/01/09 10:07:44 fros4943 Exp $ * $Id: ContikiMoteTypeDialog.java,v 1.15 2007/01/10 08:48:13 fros4943 Exp $
*/ */
package se.sics.cooja.contikimote; package se.sics.cooja.contikimote;
@ -887,7 +887,7 @@ public class ContikiMoteTypeDialog extends JDialog {
libraryCreatedOK = false; libraryCreatedOK = false;
JPanel progressPanel = new JPanel(new BorderLayout()); JPanel progressPanel = new JPanel(new BorderLayout());
final JDialog progressDialog = new JDialog(myDialog, null); final JDialog progressDialog = new JDialog(myDialog, (String) null);
JProgressBar progressBar; JProgressBar progressBar;
JButton button; JButton button;
final MessageList taskOutput; final MessageList taskOutput;

4
tools/cooja/java/se/sics/cooja/mantismote/MantisMoteTypeDialog.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: MantisMoteTypeDialog.java,v 1.2 2007/01/09 10:02:16 fros4943 Exp $ * $Id: MantisMoteTypeDialog.java,v 1.3 2007/01/10 08:48:39 fros4943 Exp $
*/ */
package se.sics.cooja.mantismote; package se.sics.cooja.mantismote;
@ -342,7 +342,7 @@ public class MantisMoteTypeDialog extends JDialog {
libraryCreatedOK = false; libraryCreatedOK = false;
JPanel progressPanel = new JPanel(new BorderLayout()); JPanel progressPanel = new JPanel(new BorderLayout());
final JDialog progressDialog = new JDialog(myDialog, null); final JDialog progressDialog = new JDialog(myDialog, (String) null);
JProgressBar progressBar; JProgressBar progressBar;
JButton button; JButton button;
final MessageList taskOutput; final MessageList taskOutput;