[SCORCHED] SF.net SVN: scorched:[13] trunk
Status: Planning
Brought to you by:
zkunath
Menu
▾
▴
[SCORCHED] SF.net SVN: scorched:[13] trunk
|
From: <zk...@us...> - 2009-02-05 22:23:39
|
Revision: 13
http://scorched.svn.sourceforge.net/scorched/?rev=13&view=rev
Author: zkunath
Date: 2009-02-05 21:30:18 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
naming convention edu.uiuc.android.scorch
Modified Paths:
--------------
trunk/AndroidManifest.xml
Added Paths:
-----------
trunk/src/edu/
trunk/src/edu/uiuc/
trunk/src/edu/uiuc/android/
trunk/src/edu/uiuc/android/scorch/
trunk/src/edu/uiuc/android/scorch/OtherActivity.java
trunk/src/edu/uiuc/android/scorch/ScorchedAndroid.java
Removed Paths:
-------------
trunk/src/com/android/scorch/
trunk/src/edu/uiuc/android/scorch/OtherActivity.java
trunk/src/edu/uiuc/android/scorch/ScorchedAndroid.java
Modified: trunk/AndroidManifest.xml
===================================================================
--- trunk/AndroidManifest.xml 2009-02-05 21:17:05 UTC (rev 12)
+++ trunk/AndroidManifest.xml 2009-02-05 21:30:18 UTC (rev 13)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.scorch"
android:versionCode="1"
- android:versionName="1.0.0">
+ android:versionName="1.0.0" package="edu.uiuc.android.scorch">
<application android:label="@string/app_name" android:icon="@drawable/scorchedicon">
<activity android:name=".ScorchedAndroid"
android:label="@string/app_name">
Deleted: trunk/src/edu/uiuc/android/scorch/OtherActivity.java
===================================================================
--- trunk/src/com/android/scorch/OtherActivity.java 2009-02-05 01:10:28 UTC (rev 3)
+++ trunk/src/edu/uiuc/android/scorch/OtherActivity.java 2009-02-05 21:30:18 UTC (rev 13)
@@ -1,48 +0,0 @@
-package com.android.scorch;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-
-public class OtherActivity extends Activity {
- private static final int MENU_OPTIONS = Menu.FIRST;
- private static final int MENU_QUIT = Menu.FIRST + 1;
-
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- // Load the compiled layout resource into the window's
- // default ViewGroup.
- // The source file is res/layout/other.xml
- setContentView(R.layout.other);
-
- // Retrieve any important stored values.
- //restoreValues(savedInstanceState);
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- super.onCreateOptionsMenu(menu);
-
- menu.add(0, MENU_OPTIONS, 0, R.string.menu_options);
- menu.add(0, MENU_QUIT, 0, R.string.menu_quit);
-
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch(item.getItemId()) {
- case MENU_OPTIONS:
- break;
- case MENU_QUIT:
- this.finish();
- break;
- }
-
- return true;
- }
-}
\ No newline at end of file
Copied: trunk/src/edu/uiuc/android/scorch/OtherActivity.java (from rev 12, trunk/src/com/android/scorch/OtherActivity.java)
===================================================================
--- trunk/src/edu/uiuc/android/scorch/OtherActivity.java (rev 0)
+++ trunk/src/edu/uiuc/android/scorch/OtherActivity.java 2009-02-05 21:30:18 UTC (rev 13)
@@ -0,0 +1,48 @@
+package edu.uiuc.android.scorch;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class OtherActivity extends Activity {
+ private static final int MENU_OPTIONS = Menu.FIRST;
+ private static final int MENU_QUIT = Menu.FIRST + 1;
+
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ // Load the compiled layout resource into the window's
+ // default ViewGroup.
+ // The source file is res/layout/other.xml
+ setContentView(R.layout.other);
+
+ // Retrieve any important stored values.
+ //restoreValues(savedInstanceState);
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ super.onCreateOptionsMenu(menu);
+
+ menu.add(0, MENU_OPTIONS, 0, R.string.menu_options);
+ menu.add(0, MENU_QUIT, 0, R.string.menu_quit);
+
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch(item.getItemId()) {
+ case MENU_OPTIONS:
+ break;
+ case MENU_QUIT:
+ this.finish();
+ break;
+ }
+
+ return true;
+ }
+}
\ No newline at end of file
Deleted: trunk/src/edu/uiuc/android/scorch/ScorchedAndroid.java
===================================================================
--- trunk/src/com/android/scorch/ScorchedAndroid.java 2009-02-05 01:10:28 UTC (rev 3)
+++ trunk/src/edu/uiuc/android/scorch/ScorchedAndroid.java 2009-02-05 21:30:18 UTC (rev 13)
@@ -1,46 +0,0 @@
-package com.android.scorch;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.Window;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-
-public class ScorchedAndroid extends Activity {
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- // turn off the window's title bar
- requestWindowFeature(Window.FEATURE_NO_TITLE);
-
- // tell system to use the layout defined in our XML file
- setContentView(R.layout.main);
-
- // set up button event handlers
- Button newGameButton = (Button)findViewById(R.id.NewGame);
- newGameButton.setOnClickListener(new OnClickListener() {
- public void onClick(View viewParam) {
- Intent i = new Intent(ScorchedAndroid.this, OtherActivity.class);
- startActivity(i);
- }
- });
-
- Button optionsButton = (Button)findViewById(R.id.Quit);
- optionsButton.setOnClickListener(new OnClickListener() {
- public void onClick(View viewParam) {
-
- }
- });
-
- Button quitButton = (Button)findViewById(R.id.Quit);
- quitButton.setOnClickListener(new OnClickListener() {
- public void onClick(View viewParam) {
- ScorchedAndroid.this.finish();
- }
- });
- }
-}
\ No newline at end of file
Copied: trunk/src/edu/uiuc/android/scorch/ScorchedAndroid.java (from rev 12, trunk/src/com/android/scorch/ScorchedAndroid.java)
===================================================================
--- trunk/src/edu/uiuc/android/scorch/ScorchedAndroid.java (rev 0)
+++ trunk/src/edu/uiuc/android/scorch/ScorchedAndroid.java 2009-02-05 21:30:18 UTC (rev 13)
@@ -0,0 +1,46 @@
+package edu.uiuc.android.scorch;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+public class ScorchedAndroid extends Activity {
+ /** Called when the activity is first created. */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ // turn off the window's title bar
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+ // tell system to use the layout defined in our XML file
+ setContentView(R.layout.main);
+
+ // set up button event handlers
+ Button newGameButton = (Button)findViewById(R.id.NewGame);
+ newGameButton.setOnClickListener(new OnClickListener() {
+ public void onClick(View viewParam) {
+ Intent i = new Intent(ScorchedAndroid.this, OtherActivity.class);
+ startActivity(i);
+ }
+ });
+
+ Button optionsButton = (Button)findViewById(R.id.Quit);
+ optionsButton.setOnClickListener(new OnClickListener() {
+ public void onClick(View viewParam) {
+
+ }
+ });
+
+ Button quitButton = (Button)findViewById(R.id.Quit);
+ quitButton.setOnClickListener(new OnClickListener() {
+ public void onClick(View viewParam) {
+ ScorchedAndroid.this.finish();
+ }
+ });
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
