Skip to content

Commit

Permalink
Merge pull request #1 from magdel/feature/no-numeric-fields
Browse files Browse the repository at this point in the history 
Removed decimal fields
  • Loading branch information
@magdel
magdel authored Sep 4, 2018
2 parents 8743359 + c44315d commit 920f2e8
Show file tree
Hide file tree
Showing 9 changed files with 1,986 additions and 109 deletions.
1 change: 1 addition & 0 deletions appconfig.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lastversion,4.8.18
121 changes: 20 additions & 101 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,11 @@
<groupId>ru.netradar</groupId>
<artifactId>mapnav-midlet</artifactId>
<name>MapNav</name>
<version>4.8.17</version>
<version>4.8.18</version>

<description>midlet project</description>

<dependencies>
<!-- <dependency>
<groupId>org.microemu</groupId>
<artifactId>microemulator</artifactId>
<scope>provided</scope>
<version>2.0.3</version>
</dependency> -->

<dependency>
<groupId>come.sun.wtk</groupId>
Expand Down Expand Up @@ -84,7 +78,7 @@
<scope>system</scope>
<systemPath>${basedir}/WTK/lib/nokiaext.jar</systemPath>
</dependency>

</dependencies>

<properties>
Expand All @@ -93,7 +87,7 @@
<wtk.home>${basedir}/WTK</wtk.home>
<j2me.midlet.vendor>Pavel Raev</j2me.midlet.vendor>
<j2me.midlet.name>MapNav</j2me.midlet.name>
<j2me.midlet.version>4.8.17</j2me.midlet.version>
<j2me.midlet.version>${version}</j2me.midlet.version>
<j2me.midlet.configuration>CLDC-1.1</j2me.midlet.configuration>
<j2me.midlet.profile>MIDP-2.0</j2me.midlet.profile>

Expand Down Expand Up @@ -152,17 +146,14 @@
<MicroEdition-Profile>${j2me.midlet.profile}</MicroEdition-Profile>
<MicroEdition-Configuration>${j2me.midlet.configuration}</MicroEdition-Configuration>
<MIDlet-Vendor>${j2me.midlet.vendor}</MIDlet-Vendor>
<MIDlet-Description>GPS navigation with YOUR MAP in your mobile phone</MIDlet-Description>
<MIDlet-Info-URL>http://mapnav.spb.ru</MIDlet-Info-URL>

<MIDlet-Permissions>javax.microedition.io.Connector.sms, javax.wireless.messaging.sms.send, javax.wireless.messaging.sms.receive, javax.microedition.io.Connector.http, javax.microedition.io.PushRegistry</MIDlet-Permissions>

<MIDlet-Permissions-Opt>javax.microedition.io.Connector.bluetooth.client, javax.microedition.io.Connector.file.read, javax.microedition.io.Connector.file.write, javax.microedition.io.Connector.mms, javax.wireless.messaging.mms.send, javax.microedition.io.Connector.socket, javax.microedition.location.Location, javax.microedition.media.control.VideoControl.getSnapshot, javax.microedition.media.control.RecordControl, javax.microedition.io.Connector.datagram</MIDlet-Permissions-Opt>

<MIDlet-Push-1>sms://:24789,app.MapMidlet,*</MIDlet-Push-1>
<Nokia-MIDlet-No-Exit>true</Nokia-MIDlet-No-Exit>
<SEMC-StandbyApplication>Y</SEMC-StandbyApplication>
<SMS-Port>24789</SMS-Port>
<MIDlet-Description>GPS navigation with YOUR MAP in your mobile phone</MIDlet-Description>
<MIDlet-Info-URL>http://mapnav.spb.ru</MIDlet-Info-URL>
<MIDlet-Permissions>javax.microedition.io.Connector.sms, javax.wireless.messaging.sms.send, javax.wireless.messaging.sms.receive, javax.microedition.io.Connector.http, javax.microedition.io.PushRegistry</MIDlet-Permissions>
<MIDlet-Permissions-Opt>javax.microedition.io.Connector.bluetooth.client, javax.microedition.io.Connector.file.read, javax.microedition.io.Connector.file.write, javax.microedition.io.Connector.mms, javax.wireless.messaging.mms.send, javax.microedition.io.Connector.socket, javax.microedition.location.Location, javax.microedition.media.control.VideoControl.getSnapshot, javax.microedition.media.control.RecordControl, javax.microedition.io.Connector.datagram</MIDlet-Permissions-Opt>
<MIDlet-Push-1>sms://:24789,app.MapMidlet,*</MIDlet-Push-1>
<Nokia-MIDlet-No-Exit>true</Nokia-MIDlet-No-Exit>
<SEMC-StandbyApplication>Y</SEMC-StandbyApplication>
<SMS-Port>24789</SMS-Port>
</jadAttributes>


Expand All @@ -186,32 +177,17 @@
<MicroEdition-Configuration>${j2me.midlet.configuration}</MicroEdition-Configuration>
<MicroEdition-Profile>${j2me.midlet.profile}</MicroEdition-Profile>
<MIDlet-Description>GPS navigation with YOUR MAP in your mobile phone</MIDlet-Description>
<MIDlet-Info-URL>http://mapnav.spb.ru</MIDlet-Info-URL>

<MIDlet-Permissions>javax.microedition.io.Connector.sms, javax.wireless.messaging.sms.send, javax.wireless.messaging.sms.receive, javax.microedition.io.Connector.http, javax.microedition.io.PushRegistry</MIDlet-Permissions>

<MIDlet-Permissions-Opt>javax.microedition.io.Connector.bluetooth.client, javax.microedition.io.Connector.file.read, javax.microedition.io.Connector.file.write, javax.microedition.io.Connector.mms, javax.wireless.messaging.mms.send, javax.microedition.io.Connector.socket, javax.microedition.location.Location, javax.microedition.media.control.VideoControl.getSnapshot, javax.microedition.media.control.RecordControl, javax.microedition.io.Connector.datagram</MIDlet-Permissions-Opt>

<MIDlet-Push-1>sms://:24789,app.MapMidlet,*</MIDlet-Push-1>
<Nokia-MIDlet-No-Exit>true</Nokia-MIDlet-No-Exit>
<SEMC-StandbyApplication>Y</SEMC-StandbyApplication>
<SMS-Port>24789</SMS-Port>
<MIDlet-Info-URL>http://mapnav.spb.ru</MIDlet-Info-URL>
<MIDlet-Permissions>javax.microedition.io.Connector.sms, javax.wireless.messaging.sms.send, javax.wireless.messaging.sms.receive, javax.microedition.io.Connector.http, javax.microedition.io.PushRegistry</MIDlet-Permissions>
<MIDlet-Permissions-Opt>javax.microedition.io.Connector.bluetooth.client, javax.microedition.io.Connector.file.read, javax.microedition.io.Connector.file.write, javax.microedition.io.Connector.mms, javax.wireless.messaging.mms.send, javax.microedition.io.Connector.socket, javax.microedition.location.Location, javax.microedition.media.control.VideoControl.getSnapshot, javax.microedition.media.control.RecordControl, javax.microedition.io.Connector.datagram</MIDlet-Permissions-Opt>
<MIDlet-Push-1>sms://:24789,app.MapMidlet,*</MIDlet-Push-1>
<Nokia-MIDlet-No-Exit>true</Nokia-MIDlet-No-Exit>
<SEMC-StandbyApplication>Y</SEMC-StandbyApplication>
<SMS-Port>24789</SMS-Port>
</manifestEntries>
</archive>
<!-- -->

<!-- <libs>
<lib>${settings.localRepository}/org/microemu/cldcapi11/2.0.4/cldcapi11-2.0.4.jar</lib>
<lib>${settings.localRepository}/org/microemu/midpapi20/2.0.4/midpapi20-2.0.4.jar</lib>
</libs> -->

<!-- <dependencies>
<dependency>
<groupId>org.microemu</groupId>
<artifactId>microemulator</artifactId>
<exclude>true</exclude>
</dependency>
</dependencies> -->
</configuration>
<dependencies>
<dependency>
Expand All @@ -220,30 +196,10 @@
<version>4.4</version>
<scope>runtime</scope>
</dependency>

<!-- <dependency>
<groupId>org.microemu</groupId>
<artifactId>cldcapi11</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.microemu</groupId>
<artifactId>midpapi20</artifactId>
<version>2.0.4</version>
</dependency> -->

</dependencies>
</plugin>

<!--
<plugin>
<groupId>com.pyx4me</groupId>
<artifactId>gammu-maven-plugin</artifactId>
<version>${version}</version>
<configuration>
<gammurc>${basedir}/gammurc</gammurc>
</configuration>
</plugin>
-->

<!-- Configure Eclipse-Me -->
<plugin>
Expand Down Expand Up @@ -285,43 +241,6 @@
</executions>
</plugin>

<!-- install jar in project site -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>site-copy-artifacts</id>
<phase>site</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<copy overwrite="true"
file="${project.build.directory}/${project.build.finalName}-me.jar"
tofile="${project.build.directory}/site/${artifactId}.jar"/>
<copy overwrite="true"
file="${project.build.directory}/${project.build.finalName}-me.jad"
tofile="${project.build.directory}/site/${artifactId}.jad"/>
<replace value="http://pyx4me.com/snapshot/pyx4me/midlet-example/${artifactId}.jar" token="${project.build.finalName}-me.jar"
dir="${project.build.directory}/site">
<include name="${artifactId}.jad"></include>
</replace>

<!-- this is not part of the example, remove it when project used as template -->
<copy overwrite="true"
file="${project.build.directory}/${project.build.finalName}-src.zip"
tofile="${project.build.directory}/site/${project.build.finalName}-src.zip"/>
<copy overwrite="true"
file="${project.build.directory}/${project.build.finalName}-src.tar.gz"
tofile="${project.build.directory}/site/${project.build.finalName}-src.tar.gz"/>

</tasks>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
1 change: 1 addition & 0 deletions src/main/java/RPMap/MapCanvas.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6091,6 +6091,7 @@ private void addMapPoint2Route(double reallat,double reallon){
textName=new TextField(LangHolder.getString(Lang.label),mp.name,30,TextField.ANY);
wptForm.append(textName);
textDist=new TextField(LangHolder.getString(Lang.distance)+", "+LangHolder.getString(Lang.m)+"\n","100",4,TextField.ANY);
//!NO NUMERIC
textAzim=new TextField(LangHolder.getString(Lang.azimut)+", "+((char)0xb0)+"\n","90",3,TextField.ANY);
Image[] ia = new Image[2];
String[] sa= new String[2];
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/app/MapForms.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1975,7 +1975,8 @@ public ChoiceGroup getChoiceSounds() {
public TextField getTextMaxSpd() {
if (textMaxSpd==null){
// Insert pre-init code here
textMaxSpd=new TextField("Max "+LangHolder.getString(Lang.speed)+' '+'('+LangHolder.getString(Lang.kmh)+')', null, 6, TextField.DECIMAL);//GEN-LINE:|90-getter|1|90-postInit
//!NO DECIMAL
textMaxSpd=new TextField("Max "+LangHolder.getString(Lang.speed)+' '+'('+LangHolder.getString(Lang.kmh)+')', null, 6, TextField.ANY);//GEN-LINE:|90-getter|1|90-postInit
// Insert post-init code here
}
return textMaxSpd;
Expand All @@ -1984,7 +1985,8 @@ public TextField getTextMaxSpd() {
public TextField getTextMaxDsc() {
if (textMaxDsc==null){
// Insert pre-init code here
textMaxDsc=new TextField(LangHolder.getString(Lang.downwarnspeed), null, 4, TextField.DECIMAL);//GEN-LINE:|90-getter|1|90-postInit
//!NO DECIMAL
textMaxDsc=new TextField(LangHolder.getString(Lang.downwarnspeed), null, 4, TextField.ANY);//GEN-LINE:|90-getter|1|90-postInit
// Insert post-init code here
}
return textMaxDsc;
Expand All @@ -1993,7 +1995,8 @@ public TextField getTextMaxDsc() {
public TextField getTextMaxClm() {
if (textMaxClm==null){
// Insert pre-init code here
textMaxClm=new TextField(LangHolder.getString(Lang.upwarnspeed), null, 4, TextField.DECIMAL);//GEN-LINE:|90-getter|1|90-postInit
//!NO DECIMAL
textMaxClm=new TextField(LangHolder.getString(Lang.upwarnspeed), null, 4, TextField.ANY);//GEN-LINE:|90-getter|1|90-postInit
// Insert post-init code here
}
return textMaxClm;
Expand Down Expand Up @@ -2756,6 +2759,7 @@ public ChoiceGroup getChoiceAutoWPTType() {
public TextField getTextMaxTP() {
if (textMaxTP==null){//GEN-END:|198-getter|0|198-preInit
// Insert pre-init code here
//!NO-NUMERIC
textMaxTP=new TextField(LangHolder.getString(Lang.points2startnew), null, 5, TextField.ANY);//GEN-LINE:|198-getter|1|198-postInit
// Insert post-init code here
}//GEN-BEGIN:|198-getter|2|
Expand Down
1 change: 1 addition & 0 deletions src/main/java/camera/FlickrList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ private void showRegForm() {
new StringItem("Visit\n", "Goto to obtain mini-token"),
new StringItem("", "www.flickr.com/auth-72157602577356052", Item.HYPERLINK),
new StringItem("to obtain mini-token", ""),
//!NO-NUMERIC
new TextField("mini-token", RMSOption.getStringOpt(RMSOption.SO_FLICKRTOKEN), 9, TextField.ANY)
});
saveRegCommand=new Command(LangHolder.getString(Lang.save), Command.ITEM, 1);
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/misc/LastVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ private void checkNewVer() {
String[] data_our=new String[3];
String[] data_site=new String[3];

if (RMSOption.tellNewDebugVersion) {
s1=HTTPUtils.getHTTPContentAsString(MapUtil.homeSiteURL+"lastdeb.txt");
} else {
s1=HTTPUtils.getHTTPContentAsString(MapUtil.homeSiteURL+"lastver.txt");
}
//if (RMSOption.tellNewDebugVersion) {
// s1=HTTPUtils.getHTTPContentAsString(MapUtil.homeSiteURL+"lastdeb.txt");
//} else {
//s1=HTTPUtils.getHTTPContentAsString(MapUtil.homeSiteURL+"lastver.txt");
s1=HTTPUtils.getHTTPContentAsString("https://raw.githubusercontent.com/magdel/MapNav/master/appconfig.txt");
//}
if (!s1.equals(RMSOption.infoAboutLastVersion)) {
if (!s1.equals(MapUtil.version)){

Expand Down
1 change: 1 addition & 0 deletions src/main/java/misc/PointEditForm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public PointEditForm(RouteEditList backDisplay) {
append(textLat);
textLon=new TextField(LangHolder.getString(Lang.longitude),null,12,TextField.NON_PREDICTIVE);
append(textLon);
//!NO-NUMERIC
textAlt=new TextField(LangHolder.getString(Lang.altitude),null,6,TextField.ANY|TextField.NON_PREDICTIVE);
append(textAlt);

Expand Down
Loading

0 comments on commit 920f2e8

Please sign in to comment.