From f7ae9e2c12f86e77aaacf5943981fd7b69adb5b8 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 26 Jun 2013 00:30:02 +0200
Subject: [PATCH] Fix opening rules

---
 .../plus/activities/OpeningHoursView.java      | 18 +++++++++---------
 .../plus/osmedit/EditingPOIActivity.java       | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java b/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java
index 3c2ca674ac..a3f3f2b41d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OpeningHoursView.java
@@ -6,7 +6,7 @@ import java.util.Calendar;
 import java.util.List;
 
 import net.osmand.plus.R;
-import net.osmand.util.OpeningHoursParser.BasicDayOpeningHourRule;
+import net.osmand.util.OpeningHoursParser.BasicOpeningHourRule;
 import net.osmand.util.OpeningHoursParser.OpeningHoursRule;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -40,7 +40,7 @@ public class OpeningHoursView {
 		this.ctx = ctx;
 	}
 	
-	public View createOpeningHoursEditView(List<BasicDayOpeningHourRule> t){
+	public View createOpeningHoursEditView(List<BasicOpeningHourRule> t){
 		this.time = new TimeAdapter(t);
 		// editing object
 		time.add(null);
@@ -80,15 +80,15 @@ public class OpeningHoursView {
 		return view;
 	}
 	
-	private class TimeAdapter extends ArrayAdapter<BasicDayOpeningHourRule> {
+	private class TimeAdapter extends ArrayAdapter<BasicOpeningHourRule> {
 		
-		public TimeAdapter(List<BasicDayOpeningHourRule> l ){
+		public TimeAdapter(List<BasicOpeningHourRule> l ){
 			super(ctx, R.layout.open_hours_list_item, l);
 		}
 		@Override
 		public View getView(final int position, View convertView, ViewGroup parent) {
 			View row = convertView;
-			final BasicDayOpeningHourRule item = getItem(position);
+			final BasicOpeningHourRule item = getItem(position);
 			if(item == null){
 				TextView text = new TextView(getContext());
 				text.setText(ctx.getString(R.string.add_new_rule));
@@ -98,7 +98,7 @@ public class OpeningHoursView {
 
 					@Override
 					public void onClick(View v) {
-						BasicDayOpeningHourRule r = new BasicDayOpeningHourRule();
+						BasicOpeningHourRule r = new BasicOpeningHourRule();
 						r.setStartTime(timePickerStart.getCurrentHour()*60 + timePickerStart.getCurrentMinute());
 						r.setEndTime(timePickerEnd.getCurrentHour()*60 + timePickerEnd.getCurrentMinute());
 						
@@ -155,7 +155,7 @@ public class OpeningHoursView {
 		}
 	}
 	
-	public void showDaysDialog(final BasicDayOpeningHourRule item, final int positionToAdd) {
+	public void showDaysDialog(final BasicOpeningHourRule item, final int positionToAdd) {
 		Builder b = new AlertDialog.Builder(ctx);
 
 		boolean add = positionToAdd > -1;
@@ -207,7 +207,7 @@ public class OpeningHoursView {
 		
 	public void updateTimePickers() {
 		if (selectedRule > -1) {
-			BasicDayOpeningHourRule item = time.getItem(selectedRule);
+			BasicOpeningHourRule item = time.getItem(selectedRule);
 			if (item != null) {
 				notifyingTime = false;
 				timePickerStart.setCurrentHour(item.getStartTime() / 60);
@@ -222,7 +222,7 @@ public class OpeningHoursView {
 	public List<OpeningHoursRule> getTime() {
 		List<OpeningHoursRule> rules = new ArrayList<OpeningHoursRule>();
 		for (int i = 0; i < time.getCount(); i++) {
-			BasicDayOpeningHourRule r = time.getItem(i);
+			BasicOpeningHourRule r = time.getItem(i);
 			if (r != null) {
 				rules.add(r);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
index ad7db239ef..34a0259207 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
@@ -24,7 +24,7 @@ import net.osmand.plus.activities.DialogProvider;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.OpeningHoursView;
 import net.osmand.util.OpeningHoursParser;
-import net.osmand.util.OpeningHoursParser.BasicDayOpeningHourRule;
+import net.osmand.util.OpeningHoursParser.BasicOpeningHourRule;
 import net.osmand.util.OpeningHoursParser.OpeningHours;
 import net.osmand.util.OpeningHoursParser.OpeningHoursRule;
 import android.app.AlertDialog;
@@ -528,12 +528,12 @@ public class EditingPOIActivity implements DialogProvider {
 			return null;
 		}
 		
-		List<BasicDayOpeningHourRule> simple = null;
+		List<BasicOpeningHourRule> simple = null;
 		if(time != null){
-			simple = new ArrayList<BasicDayOpeningHourRule>();
+			simple = new ArrayList<BasicOpeningHourRule>();
 			for(OpeningHoursRule r : time.getRules()){
-				if(r instanceof BasicDayOpeningHourRule){
-					simple.add((BasicDayOpeningHourRule) r);
+				if(r instanceof BasicOpeningHourRule){
+					simple.add((BasicOpeningHourRule) r);
 				} else {
 					time = null;
 					break;